Merge pull request #29 from ferrix/master

General cleanup
Test wheel packaging