Collaborators management

I'm making a pull request, so I can comment on this more easily. You can still push further fixes to this branch.
Since this is merged already, use "master" instead of "collab" when following the instructions.