Sync up with latest Template Toolkit, 2.24

We'll need to specify an exact version, since we're depending on
its implementation of most things but we have our own Grammar class.