Update to Rails 4.1
Merge pull request #5159 from jhass/rails41

Update to Rails 4.1