Merge pull request #2 from SpencerNussbaum/master

2.2.1 master merge
Merge pull request #3 from SpencerNussbaum/dev-spencer

Shortcodes 2.2.2