Merge pull request #128 from ray-lee/CSPACE-6302

CSPACE-6302: Fix vocabulary term initialization.
CSPACE-6302: Make sure a term has a generated shortid if none is specified, before checking if a term with the shortid already exists.