Branch/heightmap

This is a reboot of PR #336 that I accidentally tried to merge back to development.  This one goes to `mars-game-staging` as it should.

I will go ahead and merge it since the other one had been reviewed and was ready to merge.