Fixing launchers
Fixed merge conflict

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

Conflicts:
	radiant-miniCRAN/dependencies.R