Fixing some issues.
Reverting some shit. Pulled the wrong thing...
Merge branch 'master' of https://github.com/Glloyd/UristMcStation

Conflicts:
	config/admins.txt