Change user states to accommodate MacOS
Change user states to accommodate MacOS

This commit makes a couple tweaks to the user states to make them work
with the new MacOS support. It also fixes a few edge-case bugs that were
encountered while troubleshooting.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt