[WIP] Upgrade to rails master/4.2

I was going to send this when I have the complete set of patches required, but I noticed @SamSaffron has started working on it too, so we should probably share notes :smile:
does this branch in the code need to exist?