try alternate way of getting db config
Merge branch 'feature/fix-heroku'
Merge branch 'master' into develop

Conflicts:
	config/unicorn.rb