Rspec 3 fixes

This deals with the latest changes in rspec 3.0.0.beta2.

We'll need a release cut before beta2 comes out.

/cc @JonRowe @hugobarauna