Tweaks to setup.py, hopefully I didn't break it.