Make my master identical to zaiste.  Local config now completely elsewhere.