Added cg_stc_eng_stc parser.
Adding cg_stc_eng_stc test files.
Merged more regexes into cg_stc_eng_stc parser and tested.
Merge remote branch 'upstream/master'
Updated some regexes based on testing and adding new test files.
Adding cg_stc_eng_stc driver (which combines mopak, rte, and cg_stc_eng).
Merge remote branch 'upstream/master'
Added more regexes and driver test results to cg_stc_eng_stc.
Merge remote branch 'upstream/master'
More cg_stc_eng_stc regexes added to parser and driver tests.
Merge remote branch 'upstream/master'
Finished adding regexes and tests for cg_stc_eng_stc
Cleaned up old MOPAK and RTE drivers since these are all now combined in cg_stc_eng_stc driver.
Fixes to integration get_samples, and instrument agent client get samples to keep
samples in order.
Merge pull request #162 from emilyhahn/master

Merge mopak_o_dcl, rte_o_dcl, and cg_stc_eng_stc into one driver.
Missed commiting some resource files for mopak and rte.
Removed incorrect error comments in cg_stc_eng_stc test driver.
Merge remote-tracking branch 'ooici/master'

Conflicts:
	.gitignore
	.gitmodules
	Doxyfile
	README
	autolaunch.cfg
	build.xml
	buildout.cfg
	extern/coverage-model
	extern/ion-definitions
	extern/ion-functions
	extern/pyon
	res
	setup.cfg
	setup.py
Merge remote-tracking branch 'ooici/master'

Conflicts:
	.gitignore
	.gitmodules
	Doxyfile
	README
	autolaunch.cfg
	build.xml
	buildout.cfg
	extern/coverage-model
	extern/ion-definitions
	extern/ion-functions
	extern/pyon
	res
	setup.cfg
	setup.py
Merge remote-tracking branch 'ooici/master'

Conflicts:
	.gitignore
	.gitmodules
	Doxyfile
	README
	autolaunch.cfg
	build.xml
	buildout.cfg
	extern/coverage-model
	extern/ion-definitions
	extern/ion-functions
	extern/pyon
	res
	setup.cfg
	setup.py