Update to rspec 3

Includes #2, which should be merged first.