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
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 pull request #163 from rmanoni/optaa_dev

Optaa dev
Clean up unworking and outdated tests.
Merge remote branch 'upstream/master'
Updated metadata driver version
Merge pull request #164 from emilyhahn/master

Cleanup parser and driver tests.
Adding checking if the chunker is empty at the end of processing.
Merge remote branch 'upstream/master'
Fixed returned exception from extra end of file bytes to UnexpectedDataException.
Added warning logs to dataset parser end of file processing.
Merge pull request #165 from emilyhahn/master

Adding end of file processing.
Getting sio_mule_common up to date and updating mflm adcp to include those changes.
Merge remote branch 'upstream/master'
Update mflm instruments to use new sio_mule_common and bring up to date.
Fix wfp c file common to not leave data in the chunker at the end of the file.