Convert the remaining pages to haml.
Merge branch 'master' into gh-pages