Rewrote the Makefile to utilize regexes
First attempt at a sane indentation of parser.y