Tons of minor changes based on PiratePad feedback.
LET'S TRY THIS AGAIN
Merge remote-tracking branch 'remotes/upstream/master' into bleeding-edge-freeze

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
ARGH
Also I fixed the engine slightly
Merge pull request #2265 from Gamerofthegame/bleeding-edge-freeze

Map fixes