fixing a few compile errors on OSX
Merge branch 'master' of https://github.com/seshbot/glpp