Rejigger the entire presentation's order
  Rejigger the entire presentation's order
Merge branch 'master' into gh-pages

* master:
  Rejigger the entire presentation's order