sync up

This is the last of the major changes.  I guess you'll want to fast-forward the `hastexo` fork too.