Specify vagrant user/group based on provider
Merge branch 'master' of github.com:ajw0100/salt-pillar