Update for ActiveSupport and ActiveModel ~> 4.0.0