cleaned up spacing in controllers, added flash notice when user can't delete self
resolved trivial merge conflict in collab controller