fix annoying rspec warnings
Merge pull request #522 from hatt/master

fix rspec deprecation warnings