No longer using users here. Users will be created/managed by Salt.
Pull in common states from margarita repo. Add additional directory to minion file roots.