reverting back to email addresses except for new teams.
cc sosubramanian
Merge pull request #6 from sosubramanian/other_teams

reverting back to email addresses except for new teams.