adding codeship integration
adding link to site on heroku
update karma conf file
Merge branch 'master' of https://github.com/352Media/Mean

Conflicts:
	package.json
update karma config
adding staging db connectionstring
Merge branch 'master' of https://github.com/352Media/Mean
updating DB password to remove messy special characters
restoring dev connectionstring to hyperion, updating production connectionstring to EC2
trying new procfile settings
adding port 80 to production config
merger conflicts