Revert "Merge pull request #20 from TJM/issue-17"

This reverts commit c48623e607c89691fa0a4dca4c1f48a4f80f496b, reversing
changes made to 7f59b265a068ed256bd7cb0ecd7e4ce402c25ada.

This actually breaks setup.py. I need to test this further and maybe look into "packaging" before recommitting this.