Minor style fixes.
Listed error message text
Fixed the naming test case and tweaked error message text.
Merge branch 'master' of https://github.com/jgat/simpatico into tokenizer_unix

Conflicts:
	README.md