Update templates to use wp.templates with proper syntax. Clean more code.

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