Rspec2x maintenance

**DO NOT MERGE ON MASTER**

Reverted those changes which broke on RSpec 2.14.8. I would suggest merging this into a similar branch and not `master` :smile: 

Moving forward I think you can release a 1.0.x version of your gem for RSpec 3. Keep your 0.x version for RSpec 2. Since `rspec-rails` depends on this they can lock the associated version into their gemfile accordingly.