Minor code format changes
Rearranged the passport initialisation in app.js
Merge branch 'dev' of https://github.com/dcgauld/Palettes.io into dev

Conflicts:
	lib/app.js
	lib/handlers/user.js