PyParsing 2.0 does not support Python 2.x. Fixing setup script
Merge remote-tracking branch 'arskom/master'