Osx9 changes part2

Forgot to request this pull a while ago. Some formatting changes to get rid of warning messages, and added GLHeightmap.
Why'd you delete all the `gluQuadric` stuff? What if we want to draw pretty solid axes?