Final fix for agglo.learn_agglomerate
Merge Steve's stitch updates with Juan's training