Made cell merging a bit safer
Added better comments and a few assertions to help debugging
Fixed really sneaky bug in CMS triangulation