One more round of upgrading to Rails 4.1