Pushing Urist McStation config changes to be ready to pull.
Merge remote-tracking branch 'upstream/master' into config_only
Merge pull request #9 from kg333/config_only

Config only