amnesty, apprenticeship, imprisonment
Merge branch 'master' into fact-types-amnesty-apprenticeship-imprisonment
componentize the controlled vocabulary into its own spec, reduce the 'known' types to a minimal set
Fixes some numbering, and references to that numbering.
clarifying the name part qualifiers refactor
adding confidence levels to the constrained vocabulary
clarifying properties of name part qualifier
fixing up a few nits on the docs
making this whole vocabularization thing easier for people who hate RDF to swallow
Merge branch 'componentize-vocabulary'

Conflicts:
	specifications/conceptual-model-specification.md