Merge pull request #115 from apophis775/master

Minor Changes
Comment out SERVER option to test a fix for server instability

Based on the following info from the /tg/ source:

https://github.com/tgstation/-tg-station/blob/master/config/config.txt#L110
Merge pull request #119 from rahlzel/upstream

Comment out SERVER option to test a fix for server instability
updated DME
Merge remote-tracking branch 'upstream/master'