Factored out VectorClock to own class, and made VectorClock test work on
merge, and then mergeback