Vocabularies: Misc updates prior to PR * enabling hyphens within prefixed vocterms * various editorial updates