fix root passwd setting
better salt overrides
Merge pull request #69 from makinacorpus/stable

Stable