tweaks to osx build tool installation logic
Merge branch 'master' of github.com:rstudio/rstudio