Updated launchers for Mac and Windows
Merge in Rstudio

Merge branch 'master' of github.com:mostly-harmless/radiant

Conflicts: