updates for the may 22nd presentation
big updates for the presentation tomorrow. Like wow.
Merge branch 'master' into gh-pages