Upgrade to rspec 3
Merge pull request #194 from projecthydra/rspec_3

Upgrade to rspec 3