diff --git a/.travis.yml b/.travis.yml
index 97a4fc8a..97395f09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,20 +17,20 @@ env:
 
 matrix:
   include:
-    - compiler: gcc
-      env: CXX=g++ PYTHON=python CXXFLAGS=-std=c++98
-    - compiler: gcc
-      env: CXX=g++ PYTHON=python CXXFLAGS=-std=c++11
-    - compiler: gcc
-      env: CXX=g++ PYTHON=python3 CXXFLAGS=-std=c++98
-    - compiler: gcc
-      env: CXX=g++ PYTHON=python3 CXXFLAGS=-std=c++11
-    - compiler: clang
-      # clang generates an 'illegal instruction' error in the NumPy check.
-      # Perhaps we need to upgrade clang to a newer version ?
-      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++98 OPTIONS=--no-numpy
-    - compiler: clang
-      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++11 OPTIONS=--no-numpy
+    #- compiler: gcc
+    #  env: CXX=g++ PYTHON=python CXXFLAGS=-std=c++98
+    #- compiler: gcc
+    #  env: CXX=g++ PYTHON=python CXXFLAGS=-std=c++11
+    #- compiler: gcc
+    #  env: CXX=g++ PYTHON=python3 CXXFLAGS=-std=c++98
+    #- compiler: gcc
+    #  env: CXX=g++ PYTHON=python3 CXXFLAGS=-std=c++11
+    #- compiler: clang
+    #  # clang generates an 'illegal instruction' error in the NumPy check.
+    #  # Perhaps we need to upgrade clang to a newer version ?
+    #  env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++98 OPTIONS=--no-numpy
+    #- compiler: clang
+    #  env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++11 OPTIONS=--no-numpy
     - env: PYTHON=python DOC=1
 
 
@@ -51,6 +51,7 @@ addons:
     - xsltproc
     - docbook-xsl
     - python-docutils
+    - python-pip
 
 
 cache:
@@ -86,7 +87,12 @@ before_script:
 
 script:
 - scons config --python=$PYTHON --boost-include=$HOME/Boost $OPTIONS
-- if [ "$DOC" ]; then scons doc; else scons && scons test; fi
+- |
+   if [ "$DOC" ]; then
+     scons doc
+   else
+     scons && scons test
+   fi
 
 after_success:
 # Upload docs only when building upstream.
diff --git a/doc/numpy/index.rst b/doc/numpy/index.rst
index 7882747c..bb3b623e 100644
--- a/doc/numpy/index.rst
+++ b/doc/numpy/index.rst
@@ -7,7 +7,6 @@ Welcome to the documentation of the Boost.Python NumPy extension!
 =================================================================
 
 .. toctree::
-   :caption: Table of Contents
    :maxdepth: 2
 
    Tutorial <tutorial/index>
diff --git a/doc/numpy/reference/index.rst b/doc/numpy/reference/index.rst
index ea4d0485..8e39f1c8 100644
--- a/doc/numpy/reference/index.rst
+++ b/doc/numpy/reference/index.rst
@@ -3,6 +3,7 @@ Boost.Python NumPy extension Reference
 
 .. toctree::
    :caption: Table of Contents
+   :name: reftoc
    :maxdepth: 2
 
    dtype
diff --git a/doc/numpy/tutorial/index.rst b/doc/numpy/tutorial/index.rst
index 95e193df..d2d3bd94 100644
--- a/doc/numpy/tutorial/index.rst
+++ b/doc/numpy/tutorial/index.rst
@@ -3,6 +3,7 @@ Boost.Python NumPy extension Tutorial
 
 .. toctree::
    :caption: Table of Contents
+   :name: tuttoc
    :maxdepth: 2
 
    simple