amavisd::files
Merge amavisd_files branch to master
removing amavisd config from templates