Fix up exception handling

Conflicts:

	src/thermo.py
	studies/004_thermo_liquid_bromine/targets/LiquidBromine/expset.txt
	studies/004_thermo_liquid_bromine/test_parse.in
Get needed changes from thermo2