fixed specs so they'd work with the auto test facility in speclj
Upstream
Added vclocks to the writing process of documents, now need to determine conflicts