Merge branch 'master' into devel_better_data_management

# Conflicts:
#	VERSION
#	diags.conf
#	earthdiagnostics/cdftools.py
#	earthdiagnostics/cmormanager.py
#	earthdiagnostics/config.py
#	earthdiagnostics/datamanager.py
#	earthdiagnostics/diagnostic.py
#	earthdiagnostics/earthdiags.py
#	earthdiagnostics/general/module.py
#	earthdiagnostics/general/select_levels.py
#	earthdiagnostics/general/simplify_dimensions.py
#	earthdiagnostics/ocean/heatcontentlayer.py
#	earthdiagnostics/ocean/interpolatecdo.py
#	earthdiagnostics/ocean/mask_land.py
#	earthdiagnostics/utils.py
#	test/unit/__init__.py
#	test/unit/test_heatcontent.py