Updated latest from stools.  Unfortunately this means there's no commit history