Merge pull request #25 from edx/dev

Update reqs

base_requirements.txt

@@ -6,4 +6,3 @@ path.py==3.0
 pip
 pylint==0.26.0
 pytz==2012h
-scikit-learn==0.12.1

requirements.txt

@@ -2,3 +2,6 @@
 boto==2.6.0
 coverage==3.5.3
 scipy==0.11.0
+scikit-learn==0.12.1
+sphinx
+django-sphinx-autodoc