Merge branch 'master' of https://intra.acdp.at/gogs/tanja/cdplib

setup.py

@@ -9,7 +9,9 @@ INSTALL_REQUIRES = [
         'jsonref', 
         'simplejson',
         'mysql',
-        'sqlalchemy_utils'
+        'sqlalchemy_utils',
+        'sklearn',
+        'hyperopt',
 ]