Merge pull request #96 from xylar/1.5.1

Update to v1.5.1 ("emergency" release)

Author: xylar

e3sm_supported_machines/bootstrap.py

@@ -0,0 +1,4 @@
+[e3sm_unified]
+
+# the version of ESMF to build if using system compilers and MPI
+esmf = None

e3sm_supported_machines/cori-knl.cfg

@@ -1,6 +1,6 @@
 # Options related to deploying a e3sm-unified conda environment on supported
 # machines
-[deploy]
+[e3sm_unified]
 
 # is this a shared production environment?
 release = False
@@ -28,3 +28,7 @@ tempest_extremes = 2.2
 
 # the version of ILAMB to build if using system compilers and MPI
 ilamb = 2.6
+
+# the version of mache to use during deployment (should match the version used
+# in the package itself)
+mache = 1.1.3