Tim finally filling in his slides.
Merge branch 'master' into gh-pages