Remove underscores in token names, RLTK once had an issue with it and I've never really trusted it since.
Start implementing hash syntax in the parser. Also tidy up parser specs a little.