First commit of general-case merge algorithm between peers.
Currently, this implementation is empirically correct. It adopts
principles from OTs, EasySync, and (somewhat surprisingly) Bayou.