Fixed issues with CISWMI-196
Merge branch 'master' of https://github.com/ooici/marine-integrations
Merge branch 'master' of https://github.com/ooici/marine-integrations
Quieted some tests
Merge pull request #115 from sfoley/master

Addresses CISWMI-196