Merge branch 'master' of https://github.com/tgstation/tgstation #56

Job	Run time
Run Linters	1m 54s
Collect data for other tasks	10s
Compile Maps	2m 11s
Windows Build	1m 32s
Integration Tests (deltastation) / run_integration_tests	8m 36s
Integration Tests (gateway_test) / run_integration_tests	9m 29s
Integration Tests (birdshot) / run_integration_tests	8m 37s
Integration Tests (icebox) / run_integration_tests	8m 35s
Integration Tests (metastation) / run_integration_tests	8m 25s
Integration Tests (multiz_debug) / run_integration_tests	7m 35s
Integration Tests (northstar) / run_integration_tests	9m 25s
Integration Tests (runtimestation) / run_integration_tests	7m 18s
Integration Tests (tramstation) / run_integration_tests	8m 35s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 18s
Check Alternate Tests	1s
Compare Screenshot Tests	12s
	1h 29m 53s

Provide feedback