Merge branch 'conda' into 'master'

Use the version of scikit-learn that we use for testing

See merge request !55

conda/meta.yaml

@@ -30,7 +30,7 @@ requirements:
     - bob.learn.linear
     - bob.learn.libsvm
     - bob.learn.mlp
-    - scikit-learn
+    - scikit-learn {{ scikit_learn }}
   run:
     - python
     - setuptools