resolved merge conflicts
broken... middleware, needs work
Merge branch 'www-launch-v4' of https://github.com/squatconf/website into www-launch-v4

Conflicts:
	config.js
	server.js
	src/email-confirm.js
	src/email-submit.js