correct gemfile
Merge branch 'master' into chartim