Add MANIFEST to exclude tests from build.
Merge branch 'master' of github.com:dans-er/shemdros_client
Fix setup.py: remove 'Git Merge' comments.