Merge branch 'master' into 0.3

cxhernandez · web-flow · commit 25bcd84d06ab · 2017-10-02T10:50:32.000-07:00
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -4,7 +4,7 @@ numpydoc
 msmbuilder
 msmb_data
 traitlets
-ipython-notebook
+jupyter
 jinja2
 nbconvert
 pyparsing
