for roger
First checkin of the cg_stc_engineering code
Regex edits
Merge remote branch 'upstream/master'
another small step
All regexs and emily's changes rolled in
Merge branch 'master' of git://github.com/emilyhahn/marine-integrations
Bug fixes
Fixed regex bugs and updated new paramaters
Merge branch 'master' of git://github.com/emilyhahn/marine-integrations

Conflicts:
	mi/dataset/parser/cg_stc_eng_stc.py
Added more regex checks
More regex's updated and tested
Merge remote branch 'upstream/master'

Conflicts:
	mi/dataset/parser/cg_stc_eng_stc.py
First checkin for updating test driver
First checkin for updating test driver
First checkin for updating test driver
First checkin for updating test driver
First checkin for updating test driver
First checkin for updating test driver
First checkin for updating test driver