Merge pull request #3271 from Segrain/master

HUD bugfixes.
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