format YML, back to HTML
Merge branch 'master' into gh-pages