Hopefully fixed commit mess. Vocab tree appears to be functional but need to test on larger data set
Merged new features