Upgrade to RSpec 3.1

This involved changing to RSpec's `expect` syntax to get rid of all of
the deprecation warnings.