upd: massive rewrite, trimming, and use of augeas to manage master.cf