Options changes
- Options menu rearranged
- Canceling avatar choosing goes back to options menu
Ignore spectators option
Remove showjoins/showbattles from options menu
These are obscure options that just clutter up the options menu.

They're still available by the console commands /showjoins
and /showbattles