Use new htmltools API for dependencies
add htmltools dependency for rmarkdown
update knitr dependency to 1.6
Merge remote-tracking branch 'origin/master' into htmltools-refactor
Merge remote-tracking branch 'origin/master' into htmltools-refactor
add shiny package
always show shiny docs templates
add install shiny to dependency manager
prompted install of shiny
remove the allow rmd deployment option
Merge remote-tracking branch 'origin/master' into htmltools-refactor
Merge remote-tracking branch 'origin/master' into htmltools-refactor
Revert "Use new htmltools API for dependencies"

This reverts commit 1ed7cb88e7ae4758adb884a3198dde570518abbb.
Revert "add htmltools dependency for rmarkdown"

This reverts commit 176b4baf9ab0250410bd16e153d0409ea83a8e31.
remove htmltools dependency for shiny
Merge pull request #110 from rstudio/htmltools-refactor

temporarily embed development version of shiny for preview release