Fixed small RST syntax error.
Rework Witness and Token API to accept tokens as they are normally specified in JSON. Pretokenized collation is not yet working again.
The a/b transposition has the same problem as the a/b + c transposition. Fixed the test.
Pretokenized JSON now collates correctly, and does not break on tokens containing whitespace. This ought to deal with issue #18.
Check assumptions on collation without near match, and on pretokenized collation with segmentation
Allow near matching on pretokenized witnesses too
Merge branch 'python-tokenization' of https://github.com/interedition/collatex
Fixed wild import warnings.
Merge branch 'master' of http://github.com/interedition/collatex