fix setup.py and add MANIFEST.in

Conflicts:
	setup.py