upgrade newrelic
some gem upgrades
merge conflicts