Use safer userid on roomban
Merge branch 'master' of http://github.com/Zarel/Pokemon-Showdown
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/BrittleWind/Pokemon-Showdown