diff --git a/.nojekyll b/.nojekyll
new file mode 100644
index 0000000000..b9eeff71a3
--- /dev/null
+++ b/.nojekyll
@@ -0,0 +1,4 @@
+The existence of this file means GitHub will skip running Jekyll
+on our Pages, which is necessary because Sphinx uses _static,
+and underscored dirs are considered special by Jekyll.
+
diff --git a/doc/public/Makefile b/doc/public/Makefile
index f162e1b05c..1a8c303a17 100644
--- a/doc/public/Makefile
+++ b/doc/public/Makefile
@@ -5,7 +5,7 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
-BUILDDIR      = _build
+BUILDDIR      = ../..
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
diff --git a/doc/public/conf.py b/doc/public/conf.py
index 8a224b8a24..5bb6ffad9b 100644
--- a/doc/public/conf.py
+++ b/doc/public/conf.py
@@ -19,13 +19,12 @@ import sys, os
 #sys.path.insert(0, os.path.abspath('.'))
 
 # -- General configuration -----------------------------------------------------
-
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.pngmath', 'sphinx.ext.mathjax']
+extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.mathjax']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']