Updated to rspec 3
Specs pass and deprecations removed