Restore Rspec 2 support

It seems simple to restore support for RSpec 2 without messing up the matcher code too much.