Upgrade some gems to work with Ruby 2.0