Less hacky approach to ExpressionParser that only needs one parsetab.py
Merge branch '2-parsers-1-parsetab'