more refactoring of slide navigation
Merge branch 'master' of github.com:/rstudio/rstudio