Magic folder features

At present, conflict resolution for MF consists of taking the newest of the participant snapshots. The DAG is disregarded. This ticket would implement more of the documented features of MF as deemed important.

Create/edit support for MF could proceed in stages interspersed with those described in #6 according to sequential dependency.