Add a makefile for testing the parser, fix a couple of lexing rule problems.
Clean up the makefile, add test target.