More setup.py tweaks and wheel support