Merge pull request #37 from sathieu/for_upstream

Several improvements
Merge pull request #38 from sathieu/for_upstream

Merging Debian and Ubuntu u-u configs
Ensure apt.conf and apt_preferences files are removed when requested