allow overriding with a custom vocabulary
Merge pull request #39 from starzel/master

allow overriding with a custom vocabulary