Merge pull request #1 from warsaw/master

Packaging and other changes to prep for Debian upload