gets Al's work on shortcodes back into a commit on github.com

This reverts commit 93d00277a6ad96299df3d5c69270cc763ce8037c.