Updated gemfile
Merging with upstream