Revise setup.py so that correct components are included in the package
Add MANIFEST.in
Resolve merge conflicts