Refactored code, fixed vocabulary file upload and indexing of uploaded files
Merge branch 'vocabulary_fix' into lodrefine