added newrelic
moved newrelic.js to config/
require newrelic only in production
fixed package json merge conflcit