Add auth stuff with passport.js. However I also changed some stuff
pre-emptively regarding Tom's rearrangement of the api methods.
What I said last time, except this time I have files.
Merge branch 'master' of http://github.com/Hephistocles/Aperio
Pre-merge commit
Merge branch 'master' of http://github.com/Hephistocles/Aperio

Conflicts:
	routes.js
Merge branch 'master' of http://github.com/Hephistocles/Aperio
Fix the changes I made pre Tom's edit