Updated gems to latest versions
Fixed merge conflict with cukesparse version in Gemfile.lock