Added admin stuff and made has_*_role calls more user friendly