Added back in ability to set the format from the options instead of in the metadata
Merge branch 'master' of https://github.com/gwaldron/osgearth