resolves #315 consecutive terms in labeled list share same entry
template cleanups
optimizations to attribute substitution
Merge pull request #353 from mojavelinux/dlist-consecutive-labels

resolves #315 consecutive terms in labeled list share same entry