css parsing
reject settings requests if not authenticated
stuff
Merge branch 'nick'

Conflicts:
	osprey-dev2/app/routes.js
	osprey-dev2/public/tests/unit/dashboard.settings.test.js