Bump to latest machete, bump rspec