Minor fixes
Merge branch 'master' of github.com:vseloved/cl-nlp
Tokenization improvements