Update RSpec config to support RSpec 2 and RSpec 3.
Merge pull request #1125 from thomas-holmes/support-rspec-3

Support rspec 3