Add in some hover text.
Merge branch 'master' into gh-pages