Merge branch 'develop' into feature/upload-flow

Author: mfeurer

doc/usage.rst

@@ -33,7 +33,7 @@ programmatically after loading the package:
     >>> import openml
 
     >>> apikey = 'Your API key'
-    >>> openml.apikey = apikey
+    >>> openml.config.apikey = apikey
 
 The second option is to create a config file:
 

openml/testing.py

@@ -45,6 +45,7 @@ def setUp(self):
         self.production_server = "https://www.openml.org/api/v1/xml"
         self.test_server = "https://test.openml.org/api/v1/xml"
         openml.config.server = self.test_server
+
         openml.config.set_cache_directory(self.workdir, self.workdir)
 
     def tearDown(self):

requirements.txt

@@ -5,4 +5,5 @@ liac-arff>=2.1.1dev
 xmltodict
 nose
 requests
-scikit-learn
+scikit-learn
+nbformat