move to rspec 3
Merge pull request #1117 from stamm/master

Move to rspec 3