Fix #798 -- Bring back support for pyparsing 1.5.7
Merge pull request #859 from brutasse/fix/pyparsing

Fix #798 -- Bring back support for pyparsing 1.5.7