Merge branch 'gh-pages'

Conflicts:
	Procfile
	scripts/coffee/init.coffee