bug fixes, fixing spectra merge
Merge branch 'master' of github.com:CSTARS/ckanext-esis