macro: \define{...} for terms being defined
tweaking hlevels
Merge remote branch 'origin/master'