updated gemfile
Merge branch 'rails_4.0.0'