Updated local copy of Rivets

Soon to move to a build tool and remove local copies from the repo...