Rails 4.1.1

:fork_and_knife: Upgrades to Rails 4.1.1 and makes a few changes to account for some API changes.
I'm pretty sure these two are equivalent.