Fix duplicate hotkey mapping

No point in having hotkeys if they overlap!
```&Challenge``` and ```&Control Panel```
```&Ban``` and ```&Ban for...```

Also the indent wasn't me. Just pulled from master before doing this and it was all lined up in the editor.