Update to rspec 3.x