Updates for Ruby 2.1.2 and Rails 4.1.1