[Pull me in fourth]Rails 4.1

This builds on previous PRs that are still pending.