Tweaks to setup.py and packaging