Tokenizer is done... probably should be tested
Merge remote-tracking branch 'origin/lucene' into lucene