cleaned up before blocks
added email to nonadmin user
reducing it-blocks to bare minimum
refactored authorize to act as a boolean
remove promote_to_org_admin method from user model and change arguments to update_attributes