Corrected dependencies in docs and setup.py.
Merge branch 'dependency-fixes'