More versioning.  Fix up cloning repos with USE_TOOLSHELF.
Remove old catalog files.