Fix up some failed merge files
Remove new toys from mutators config (it is set in its own config)
No it isn't
Include balance from samual/weapons as balance-samual, merge reversion balance into balance-xpm (but with XPM crylink)
Merge weapon balance changes between XPM and xonotic
Fix compile
Fix porto
Fix missing tuba cvars in the balance configs, and add code to w_tuba.qc
so this doesn't happen again.