Revert most of last commit - bots were not joining teams.  Too much
for one day...