Merge branch 'feature_mkl_default' into 'master'

Distribute MKL-enabled builds by default

See merge request lscsoft/conda!32

environment-py27.yml

@@ -35,6 +35,7 @@ dependencies:
   - hveto
   - kombine
   - lalsuite
+  - lal=*=mkl*
   - ldas-tools-al
   - ldas-tools-diskcacheapi
   - ldas-tools-filters

environment-py36.yml

@@ -34,6 +34,7 @@ dependencies:
   - hveto
   - kombine
   - lalsuite
+  - lal=*=mkl*
   - ldas-tools-al
   - ldas-tools-diskcacheapi
   - ldas-tools-filters

environment-py37.yml

@@ -34,6 +34,7 @@ dependencies:
   - hveto
   - kombine
   - lalsuite
+  - lal=*=mkl*
   - ldas-tools-al
   - ldas-tools-diskcacheapi
   - ldas-tools-filters