more improvements to upstream url detection
Merge branch 'master' of github.com:/rstudio/rstudio