Merge pull request #6 from u-c-l/repair

Implement the actual repair.
Add instrumentation.
Merge branch 'master' of github.com:peterbourgon/crdt into repair