this should fix a weired test polution case on travis where the x-git-revision header is suddenly nil

MS DC; as newrelic yml is always included, you need it in your bundle; also, make travis scripts noisy if they fail

MS DC; oauth keys are now pulled out of application.yml to be simplier.  incldue newrelic as heroku expects it, without affecting people who do not use newrelic. If you do use new relic in production, you have to put your newrelic api key in application.yml

instead of redirecting to  regular joindiaspora u just go 2 the site

add the GC profiling option for newrelic for 1.9.2; see: http://newrelic.com/docs/ruby/ruby-gc-instrumentation

Fix from-scratch migration on PostgreSQL with a non-root DB user

DC MS; make heroku gem its own group.  if your user does not have a home directory, you will need to bundle --without heroku in production

This reverts commit 64081059.

Conflicts:

	db/schema.rb