Edit out the presentation
Updated some things I missed
Merge branch 'master' into gh-pages
Fix outline.html