Nightly Pull

- kill unnecessary discriminators on generic Team and Lobby
- on_create_lobby now creates highlander or sixes lobbies
- add arg to on_create_lobby for type of lobby
- fix test