Upgrade to rspec 3.1