Ripping out all the nonsymmetric p-overlap merging stuff, and putting in symmetric merging stuff
Adding back the trivial boundary joining.
Added a test to reveal that genome-restricted mapping is broken