Rails 4 2 updates

This PR will soon have a checklist of the Rails 4.2 changes to be fixed and any issues I've encountered.

PR work in progress.
Trailing whitespace detected.