Removed a bunch of Clang warnings (with -Weverything)
Changed "s" -> "thl" as internal variable in thermo moist
Merge remote-tracking branch 'upstream/master'