Updated rails, added newrelic_rpm
Merge branch 'develop'