Merge pull request #244 from mancdaz/master

Merged automatically by jenkins after successful build test
Cleanup of documentation and metadata files
Fix typos
Clean up templates not referenced in code
Merge pull request #245 from mattt416/doc_cleanup

Merged automatically by jenkins after successful build test