cleanup and rearrange a bit
remove [collapse_this] if present when running free version

git-svn-id: https://plugins.svn.wordpress.org/formidable/trunk@835828 b8457f37-d9ea-0310-8a92-e5e31aec5664