Fixed 2 issues, see readme.txt to see changes

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