Change to newer gemfile
Merge new gemfile