Update database.yml
Added multi_json correct version to Gemfile
Removed SECRET_KEY_BASE, should be in environ variable
fixed merge