Updates to Rails 4.1