Update bundler and rubygems for Ruby 2.1.5
Merge pull request #238 from bryantraywick/rails-machine-update-bundler-and-rubygems-for-ruby-2.1

Update bundler and rubygems for Ruby 2.1.5