Upgrade to Ruby 2.1.1
Merge branch 'master' into rails-3-2