cleanup of fieldmaps (removed "s"), move tmp fields from "sd" to "atmp" to allow automatic copies of diagnostic fields to GPU, without always having 4 tmp fields (we only need 2)
GPU and CPU versions working again with new fieldmap containers
Minor cleanup
GPU version leak free
Merge remote branch 'upstream/master' into cuda

Conflicts:
	src/advec_2.cu
	src/advec_4.cu
	src/advec_4m.cu
	src/boundary_surface.cu
	src/boundary_surface.cxx
	src/budget.cxx
	src/diff_les2s.cu
	src/diff_les2s.cxx
	src/fields.cu
	src/fields.cxx
	src/force.cu
	src/model.cxx
	src/pres_2.cu
	src/pres_4.cu
	src/thermo_buoy.cxx
	src/thermo_buoy_slope.cxx
	src/thermo_dry.cxx
	src/thermo_moist.cxx