properly expand nonterminal symbols in the termite grammar + various bugfixes
Merge github.llnl.gov:prantl1/rose
Merge branch 'master' of /nfs/casc/overture/ROSE/git/ROSE
Merge commit '3bcbe806c4774af1c8ff3b82c2c819d55d695fe5' into HEAD