attempted fixes to setup and manifest
Merge branch 'master' of github.com:bepetersn/Python-Hackpad-API

Conflicts:
	setup.py