Upgrade to RSpec 3.1

Lots of code thrash here, sorry about that. It's tough to avoid with major releases of dependencies.