Weekend Update prior to Aarons stuff
Merge branch 'master' of ssh://github.com/rSimulate/WebHexPlanet