Clone of Rebecca Lawler's Open Reconcile project from https://code.google.com/p/open-reconcile