Updated list of ControlledVocabularies

Also, minor changes in the layouts of diagrams as I was making screen
shots.