Simplify structure for Controlled Vocabularies

[johnwunder]

Simplify model and implementation structures for using Controlled Vocabularies such that use of terms from the default vocabulary is as simple as possible while still supporting assertions of values from non-default controlled vocabularies and ad-hoc terms that are not from any controlled vocabulary.

Issue 380 in STIX tracker.