Enable the switch for stats properly
Put a proper switch in thermo
Merge remote-tracking branch 'upstream/master' into stats

Conflicts:
	include/thermo.h
	include/thermo_dry.h
	include/thermo_moist.h
	src/thermo_moist.cxx
Updated all input files for new stats settings