update grammar to one Sam put together that closely follows the spec.
Merge branch 'master' of github.com:antlr/grammars-v4