Removed Amavis, SpamAssassin and ClamAV configuration (Should be provided as plugin)
Merge remote-tracking branch 'upstream/master' into muhkuh