Commit so I can merge (must remember to exclude these in git ignore)
Merge branch 'master' of https://github.com/warrenbuckley/Analytics

Conflicts:
	Analytics.Site/App_Data/Logs/UmbracoTraceLog.txt