Reverted previous pushing of the new osg_* uniforms as it needs some more investigation.
Merge branch 'master' of github.com:gwaldron/osgearth