Clean it up a bit.
New version of the docs
Merge branch 'temp-branch' into gh-pages