* Changed the Shortcode code to be inline with other WordPress Shortcode
* Fixed issues with things not being output as expected [thx André Grobbee]
* Major refactor; around 100 LOC removed
* Prep for next steps in the plugin's future