Fix MANIFEST and setup.py bits