integrate pandoc functions
merge commit

Merge branch 'master' of github.com:rstudio/rmarkdown

Conflicts:
	R/pandoc_args.R
	R/util.R