Update to latest stable rails (4.1.6)
Hopeful fix for the test db in travis
Merge branch 'rails-4.1'