fiddling with Gemfile
fixing new relic always enabled because of a wrong if-clause check at app/api.rb#23
fixing merge problem