Splitting grammar out into separate files
Unsplitting jison files

seems that grunt jison doesn't support separate jison and jisonlex files
Improvements to lexer