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'