Pointed the rails-4.0 gemfile against master