Minor changes to README.
Merge branch 'master' into tokenizer_unix
Update API and test file names.

Formalised the API to make testing code easier.
Renamed test files to follow file naming conventions (no underscores).