Merge pull request #125 from glenwks/master

Tournament join updates