remove spurious output settings
Merge branch 'gh-pages' of github.com:rstudio/rmarkdown into gh-pages