improved home directory detection on windows
fix win64 compilation issue introduced by socket proxy
Merge branch 'v0.98-shiny' of github.com:rstudio/rstudio into v0.98-shiny