Update spec_helper to rspec 3.1.0 defaults
No monkey patching for rspec
Fix rspec rake tasks