Put thermo in the new init form and move includes as much as possible to
the source files
Removed unused variables from the dry_thermo
Fixed a bug in the new boundary_user patch description
Merge branch 'chiel' into masterupstream
Merge remote-tracking branch 'upstream/master' into mymod

Conflicts:
	src/model.cxx
Updated boundary file with the sinusoidal plus perturbations