Merge pull request #1330 from Kenneth-T-Moore/herb_mm

Some timeout and checks hopefully fix intermittent failure when slotting...
Merge pull request #1331 from Kenneth-T-Moore/herb_mm

Changes to the docs from the vartree metamodel changes.
Trying more stuff