In the process of merging Dario's changes, and responding to remaining holes in the manuscript.  After this, I will clean up the repository so we don't have ten copies of OverlapDemux.docx