Add easier-to-type rake reset
Update specs to rspec 3 syntax