Started converting dofst_k_wfp driver to telemetered and recovered, and update callbacks to use lambda.
Merge remote branch 'upstream/master' into test_branch
Updated unit tests to handle multiple harvester / parser case, driver improvements.
Fixed bug in qual new harvester file exception test.
added support for multi-harvseter drivers
Changes to nose test to get ingestion test to work (Bill F wrote).
Merge branch 'test_branch', remote branch 'upstream/master' into test_branch
skip failing test for non-released driver
rollback changes from inadvertant merge
Merge pull request #202 from wfrench/master

rollback changes from inadvertant merge
Merge branch 'test_branch', remote branch 'upstream/master' into test_branch
Merge pull request #198 from emilyhahn/test_branch

CIDEVMI-1328 telemetered / recovered combined with same parser
added units of measure abbreviation strings
Merge pull request #204 from danmergens/unit_fix

added units of measure abbreviation strings
Merge branch 'master' of git://github.com/ooici/marine-integrations into massp
parameter descriptions/constraints, cleanup