Merge branch '12-sphinx' into 'master'

update sphinx to 1.4.6

Closes #12

See merge request !4

install/from-scratch.sh

@@ -36,7 +36,7 @@ if [[ "$PYTHON_VERSION" == "2.7" ]]; then
     cmake \
     pip=8.1.2=py27_0 \
     coverage=4.2 \
-    sphinx=1.4.1=py27_0 \
+    sphinx=1.4.6=py27_0 \
     sphinx_rtd_theme=0.1.9=py27_0 \
     cython=0.24=py27_0 \
     docopt \
@@ -60,7 +60,7 @@ if [[ "$PYTHON_VERSION" == "3.4" ]]; then
     cmake \
     pip=8.1.2=py34_0 \
     coverage=4.2 \
-    sphinx=1.4.1=py34_0 \
+    sphinx=1.4.6=py34_0 \
     sphinx_rtd_theme=0.1.9=py34_0 \
     cython=0.24=py34_0 \
     docopt \
@@ -84,7 +84,7 @@ if [[ "$PYTHON_VERSION" == "3.5" ]]; then
     cmake \
     pip=8.1.2=py35_0 \
     coverage=4.2 \
-    sphinx=1.4.1=py35_0 \
+    sphinx=1.4.6=py35_0 \
     sphinx_rtd_theme=0.1.9=py35_0 \
     cython=0.24=py35_0 \
     docopt \