General cleanup
Merge branch 'master' of github.com:gwaldron/osgearth