Added collaborator model, updated user and wiki. Part of #20