Implements the Vocabulary changes necessary
Fixes tests
Merge pull request #59 from lukecampbell/shortcut

Implements the Vocabulary changes necessary