Upgrade to rspec 3 and convert all syntax