more sane setup.py
Merge pull request #216 from ndawe/master

MRG: more sane setup.py