usgs header
merge conflicts
Merge pull request #317 from mwernimont/master

USGS Header
Merge branch 'master' of github.com:USGS-CIDA/CIDA-Viz