made default operator as and
Ran auto pep on test_tokenizer
minor convention changes
Bumped version
fix conflicts