WIP - refactoring shortcode parsing
Merge branch 'master' of git://github.com/johnshopkins/wpapi-php