Settings port can now change for computers running two servers
cONFLICTS
Merge branch 'master' of github.com:MCForge/MCForge7-Vanilla