Fixed production server check
Catch error and deal with it
Merge branch 'master' into production

Conflicts:
	app/express.coffee