Initial control after running start_driver and before starting code changes.
Update at completion of parser unit test
Update at completion of parser unit test
Interim update during integration test
xxx
Merge remote branch 'upstream/master'

Conflicts:
	mi/dataset/parser/test/test_vel3d_k_wfp_stc.py
Interim update
Merge remote-tracking branch 'origin/master'

Conflicts:
	mi/dataset/parser/test/test_vel3d_k_wfp.py
	mi/dataset/parser/vel3d_k_wfp.py
	mi/dataset/parser/vel3d_k_wfp_stc.py
Update at end of qual test
Update at end of qual test
Merge remote branch 'upstream/master'
Interim update at completion of integration tests
Update at completion of qual tests for combined vel3d driver
Update at completion of qual tests for vel3d combined driver
Update at end of qual test
Merge remote-tracking branch 'origin/master'

Conflicts:
	mi/dataset/driver/vel3d_k/wfp_stc/driver.py
	mi/dataset/parser/vel3d_k_wfp_stc.py
#first round of cleanup
first round of cleanup
completed unit testing
-implemented execute_acquire_status and sample
-implemented execute_reset

still to do:
-scheduleables
-capabilities

*working under assumption VELPT is exactly like VEL3D
completed unit tests for velpt (excluding impact from IOS review)
added test_chunker to be implemented by child test_driver