update some deprecated rspec methods
Merge pull request #540 from tiegz/spec_deps

Update some rspec methods that warn of deprecations.