Merge pull request #163 from wardi/master

navl schema: tag vocab fix, start of trim package tests and first fix
add "Form Descriptors", topic category mapping
schema description: update for form descriptors (and forgotten example change)
schema description: add subject_ids to topic category choices