Got farther in the test with new coi-services code (OOIION-1121 included), still not passing all tests
Fixed some SBE37 and general timeout weirdness
Merge pull request #109 from sfoley/master

Fixed some SBE37 wonkiness, should pass buildbot tests now...should...
Merge branch 'master' into sami
Merge branch 'sami' into base