Upgrade to rspec 3

![lol](http://www.catgifpage.com/time-space-cuteness)
Followed the instructions here to upgrade https://www.relishapp.com/rspec/rspec-rails/docs/upgrade