Updates for Ruby 2.1.3 and Rails 4.1.6