General cleanup.
Changed source filenames for reverting in uninstall().
Merge pull request #39 from rcconvict/master

General cleanup and bug fixes