Update Sphinx to work with latest homebrew version.
Recover s3cmd and pv.