Osx9 changes part2

Forgot to request this pull a while ago. Some formatting changes to get rid of warning messages, and added GLHeightmap.
The #ifndef guards here should be named like you changed the GLAxis ones.