patch rspec to work with latest rake
Merge branch 'master' into comments