token mapping, better function in lex, etc
Merge branch 'master' of https://github.com/kevin-roark/arthur

Conflicts:
	compiler/frontend/arthur.yacc