Updated slides. Should be just about finished.
Merge branch 'master' into gh-pages