fixed (and reflowed) setup.py
Merge remote-tracking branch 'origin/master'
reflow setup.py again... reformat code on commit was a bad idea