included supervisor state
make salt-hack work for differing install dirs
supervisor hack state/module latest for 0.16.4
APT fix from https://github.com/saltstack/salt/pull/7949