move the app auth setting back to config, otherwise it's loaded too late for the uploader
Merge branch 'master' of github.com:Automattic/sulfur

Conflicts:
	app/app.js