Removes combat module on green and blue alert.
Cleaned up config files to be more generic; main server isn't mirrored from these any more, and they are horribly out of date.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Quickfix for IRCbot nudge

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Merge branch 'master' of github.com:Baystation12/Baystation12 into nudgefix
Merge pull request #3277 from Mloc/master

Cleaned up config files.
Merge pull request #3279 from Mloc/nudgefix

Nudgefix
Fix for #3281.
Fix for #3166.
Fix for #3286.
Merge pull request #3282 from Segrain/master

Bugfixes.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Changed combat module to VV only pending rebalancing.
Merge pull request #3288 from Zuhayr/master

Combat adminspawn-only fix.
Merge branch 'master' of github.com:Baystation12/Baystation12
This one isn't used currently and is only confusing people.
Fixed #3290.
<_< you saw nothing >_>