lobby and match were combined into game a little while back, but specs weren't

combine lobby-spec and match-spec into game-spec. also resolve issue with hasPlayer on game.