Fix User#on_team?
Merge pull request #261 from jakegavin/welcome-email-bug

Bounty #455 - Fix User#on_team?