Merge pull request #45 from Agent-H/usagestats

added mixpanel
improved messaging
Merge branch 'tos_contact' into develop
Merge branch 'develop' of github.com:Agent-H/tunesquared into develop

Conflicts:
	views/desktop.ejs
Merge branch 'develop' into staging

Conflicts:
	controllers/contact.js
	views/desktop.ejs