Allow rspec 3.
Merge branch 'rspec-3'