Rewriting filters and ading more template cases - v2.5

git-svn-id: https://plugins.svn.wordpress.org/google-plus-authorship/trunk@831344 b8457f37-d9ea-0310-8a92-e5e31aec5664