Progress commit for auth refactor.
Merge branch 'master' of https://github.com/JedWatson/keystone-forum

Conflicts:
	models/User.js
	routes/auth/confirm.js
	routes/index.js
	templates/views/auth/confirm.jade