Update rspec and remove deprecation warnings on trunk with newest gems.