Merge branch 'master' into devel_better_data_management

# Conflicts:
#	VERSION
#	diags.conf
#	earthdiagnostics/datamanager.py
#	earthdiagnostics/earthdiags.py
#	earthdiagnostics/general/dailymean.py
#	earthdiagnostics/general/monthlymean.py
#	earthdiagnostics/general/select_levels.py
#	earthdiagnostics/general/simplify_dimensions.py
#	earthdiagnostics/general/yearlymean.py
#	earthdiagnostics/ocean/heatcontent.py
#	earthdiagnostics/ocean/mixedlayerheatcontent.py
#	earthdiagnostics/ocean/mixedlayersaltcontent.py
#	earthdiagnostics/ocean/moc.py
#	earthdiagnostics/ocean/regionmean.py
#	setup.py