Clean up and restyle
Merge branch 'master' of https://github.com/hmmhhack-tv-app/hmmh-tv

Conflicts:
	views/layout.jade