Upgrade to Rspec 3.0 beta, fixing some deprecations