Fixed database.yml
Updated.lock
Updated database.yml
Updated Gemfile