Moved uninstall placeholder from hook to uninstall.php
Merged upstream changes, maintained separation of uninstall functionality
Merge pull request #24 from Japh/master

Suggested fix for #22