merge in fixes from 2010-2012

Mostly updates to the rubrics and changes in terminology.
Backwards-compatibility is maintained, along with not-very-stern
warnings when the old terms are used.
make a zip as well as a tar.gz in the release target
make the typeout warnings a bit more greppable
make the test target use pdflatex

mostly so the draft watermark is obvious (my dvi viewer doesn't display it
in the dvi version at all)