Gemfile now has sqlite3 DB for env/development, pg for env/production
Fix merge conflict in config.ru