Remove ply/cpp.py and add Makefile
Reorder yacc rules
Clarify regex grammars