Gemfile~ and database.yml