Cleaned up some cruft, consolidated the annotation resource, and added a function to get users who belong to another user's groups