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 pull request #1 from Baystation12/master

Bugfixes from Master
Merge branch 'master' of https://github.com/ZomgPonies/Baystation12

Conflicts:
	config/admin_ranks.txt
	config/admins.txt
	config/alienwhitelist.txt
	config/config.txt
	config/custom_items.txt
	config/custom_sprites.txt
	config/game_options.txt
	config/moderators.txt
Merge pull request #3 from ZomgPonies/master

Master merges