Upgrade to Rspec 3.1