Ensure apt.conf and apt_preferences files are removed when requested
Merge pull request #39 from sathieu/for_upstream

Ensure apt.conf and apt_preferences files are removed when requested