setup runs now with python2
more python2 everywhere
Merge remote-tracking branch 'upstream/master'
Merge pull request #330 from mkawalec/master

Setup runs correctly on distros that have switched to python3 or where python is in a different place