updating for escaping issue and general cleanup

git-svn-id: https://plugins.svn.wordpress.org/gp-pro-freeform-style/trunk@1000934 b8457f37-d9ea-0310-8a92-e5e31aec5664