updated parser to remove scatter and pairwise
Merge branch 'pyparsing' of https://github.com/mit-probabilistic-computing-project/BayesDB into pyparsing