Make team/user relationship many to many
willkg's nits
Merge branch 'm2m-teams'