Merge pull request #219 from hynek/fix-setup

Fix setup.py & MANIFEST.in