infrastructure edits
further clean-up
stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/app/controllers/user.coffee
	src/app/models/user.coffee
Merge too