bump version
Updates from making dsa package driver that just haven't been commited
in this branch yet.  Improved dsa templates.
Merge remote branch 'upstream/master' into clean_dsa

Conflicts:
	mi/idk/dataset/metadata.py
	mi/idk/templates/dsa/driver.tmpl
	mi/idk/templates/dsa/driver_test.tmpl
Merge branch 'master' of github.com:ooici/marine-integrations
bump submodule
Fixed issues with CISWMI-196
adjust DSA test to publish particles
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
Added replacing the mi namespace when generating versioned eggs with
the driver versioned name.mi, since this follows the new versioned
directory structure in the egg.
Merge remote branch 'upstream/master' into clean_dsa
added new thread for harvester.  pulled get sample code out of
data processer thread because it was blocking the data subscriber
bump version
Merge branch 'master' of github.com:ooici/marine-integrations
Merge remote branch 'upstream/master' into clean_dsa
Merge pull request #116 from emilyhahn/master

Merge Emily's data set agent template and packaging changes