Add tokenizer
Fix tokenizer indenting. Need to implement CJK tokenizer