Prepare for merge.
Merge branch 'master' of github.com:martindale/soundtrack.io

Conflicts:
	views/layout.jade