Fixes to get this to actually install.
Merge pull request #1 from mythmon/master

Fixes to get this to actually install.