Merge branch 'gh-pages'

* gh-pages:
  Get rid of refactoring slide
  commit on gh-pages
Once again waffle on the format of the 'adopting' section
Merge branch 'master' into gh-pages

* master:
  Once again waffle on the format of the 'adopting' section