* updated stable trunk
* Added basic shortcode functionality
* Basic code organization

git-svn-id: https://plugins.svn.wordpress.org/post-series/trunk@1014848 b8457f37-d9ea-0310-8a92-e5e31aec5664