db and gemfile changes from latest master pull