Update dependencies so we can bundle with Rails 4.1
Merge pull request #3057 from romansklenar/rails-dependencies

Update dependencies so we can bundle with Rails 4.1