DOC: Small tweaks.
DOC: even better.
New version of the docs
Merge branch 'temp-branch' into gh-pages