Don't tolerate erros in init-minion, and minor changes in salt config