Fix diff algorithm for reflists with duplicate entries. #57
Introduce Package.ShortKey(): packages should have no conflict on that key in one list. #60
Conflict detection for packages in one list. #60
Support for -no-remove while merging snapshots. #57