update all the things
Merge branch 'master' of https://github.com/krafthaus/website

Conflicts:
	config/deploy.rb