Add ogc vocabulary, in addition to og.
Recover from looking up term type, which may fail if the vocabulary exists as a StrictVocabulary, but a new term is referenced.
For comments, allow language en-US (really /^en-?/) when creating vocabulary definition.
Update OGP vocabularies to get comments.