slight changes to parser, and messing with simplefit
Merge branch 'master' of https://github.com/scott-maddox/simplepl