Do some refactoring
should be allocating vocabulary IDs now
forgot to add a bunch of files to git
Merge branch 'master' of github.com:orezpraw/unnaturalcode