iOS fixes for osgEarth 2.5
Merge branch 'master' of https://github.com/gwaldron/osgearth