Previous commit was missing some code. :$
Merge branch 'master' of git@github.com:webistor/webistor-app.git

Conflicts:
	app/config.coffee