Merge pull request #725 from jmaas/master

Remove web_setup.py; as it wasn't used anyway.
Merge pull request #726 from jmaas/master

Remove unused references from MANIFEST.in