fix a docstring
Merge branch 'master' of github.com:dit/dit
Add sphinx to doc requirements.txt