New correct grammar for GenericTokenChar and new tests.
Merge branch 'master' of https://github.com/RoPython/wispy