Merge branch 'master' of github.com:martindale/soundtrack.io into angular-test

Conflicts:
	public/js/app.js
	soundtrack.js
	views/index.jade
	views/layout.jade
	views/partials/message.jade