Osx9 changes part2

Forgot to request this pull a while ago. Some formatting changes to get rid of warning messages, and added GLHeightmap.
Indentation seems off here. Something should be indented differently, I think.