Changes to setup.py and MANIFEST.in