Merge pull request #13 from foresthoffman/master

Store Shortcode Fix: inline shortcodes
Merge pull request #14 from foresthoffman/master

Version 1.1.4, Store Shortcode Update
Merge branch 'master' of http://github.com/foresthoffman/game-on

This merge is intended to bring foresthoffman/game-on up-to-date with TheMacLab/game-on changes and then push the former's commits on to the latter's remote repo.