The binary directory can now be specified when building from source, and Sphinx
now takes its version into account when checking if it is already installed.
Merge branch 'binary_path'

* binary_path:
  The binary directory can now be specified when building from source, and Sphinx now takes its version into account when checking if it is already installed.