Update to latest (breaking) RSpec 3 changes

http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3
https://github.com/rspec/rspec-expectations/pull/530