Merge pull request #43 from csmith/master

Use new sudo-user role.
Use user role.