Updated a few files to Rails 4.2.0 conventions