Various fixes
Merge branch 'master' of github.com:te-chris/distiller-site

Conflicts:
	source/javascripts/all.js
	source/stylesheets/all.sass