Only include newrelic if on production
Merge branch 'master' into challenge-updates

Conflicts:
	app.js