Fix #511 namespace clash on iOS Simulator
Merge branch 'master' of github.com:gwaldron/osgearth