Rails 4.1 upgrade