Osx9 changes part2

Forgot to request this pull a while ago. Some formatting changes to get rid of warning messages, and added GLHeightmap.
I've personally always found these comments to be sort of wasteful. Doxygen style comments above the function declaration might be easier to format and would be parsed by Doxygen.