Trying fancy new Makefile scheme
More lexer tests
Merge branch 'master' into lexer-ast