Upgrade to Rails 4.1

NOT READY TO MERGE

This is just a tester push to see what errors Travis picks up.