Various changes and improvements.

git-svn-id: https://plugins.svn.wordpress.org/chillthemes-shortcodes/trunk@1038969 b8457f37-d9ea-0310-8a92-e5e31aec5664