Osx9 changes part2

Forgot to request this pull a while ago. Some formatting changes to get rid of warning messages, and added GLHeightmap.
gluQuadratic is deprecated in 10.9, and the mass of warnings telling me so were burying the actual errors. We could put it back, if you want.