adding a proper vocab url, misc context fixups.
Merge pull request #24 from jasnell/master

adding a proper vocab url, misc context fixups.