Merge pull request #15 from cloudsleuth/master

Adding packaging refinements
Improving cleanup