well, derp, an Admin can delete any user, and a User can't delete any user, so no need
Merge branch 'refs/heads/admin'