Attempt to fix PyPi packaging issues...
Merge pull request #7 from jwiggins/fix/pypi-packaging

Attempt to fix PyPi packaging issues...