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
not sure why we are ignoring all txt files from git.  Removing this
ignore so data files can be stored
updated dataset tests so they can read from datafiles stored in the
resource directory