Remove colours from makefile
Parse if/elif/else

Minor hack to allow either `elif` or `else if` syntax.
Also make the BNF in the comments more consistent (unrelated to if/else)