Merge pull request #1 from kcorkan/master

Various updates
add analytics to test templates
added .project and .settings to .gitignore file