Lots of gem updates and test fixes for rspec 3.0