[rspec-upgrade] Used transpec to convert to RSpec 3 syntax
[rspec-upgrade] Upgraded to RSpec 3.

There was a single deprecation here RE: one of the generated settings in
spec_helper. I removed it, and then slimmed down spec_helper, in
response.
Upgraded to RSpec 3.

It took 3 minutes.

Yay for transpec and friends.

Merge branch 'rspec-upgrade' into upcoming

* rspec-upgrade:
  [rspec-upgrade] Upgraded to RSpec 3.
  [rspec-upgrade] Used transpec to convert to RSpec 3 syntax