added support to rspec 3
supports rspec 3 while keeping compatibility with 2.2
merge conflicts
removed trailing whitespace
Merge in support for RSpec 3