[CLEANUP] grXML grammar from config (unused since we're using jsgf), and tidy up jsgf grammar