Add sudo_rules to user, now required by upstream changes.
Merge branch 'master' of https://github.com/hipikat/salt-pillars

Conflicts:
	users.sls