Fix specs against rspec3

With a fresh `bundle install` I get rspec 3.1.0. This updates some deprecation issues so that the test suite passes. It does not make any unnecessary syntax changes to modernize the test suite. That should be done in an ongoing basis and/or as a separate change.