Whoops, pushed broken setup.py from merge

Not good at merging from my mac!