inst-svn_external merge issue

git-svn-id: svn+ssh://civmxsrv2.duhs.duke.edu/Users/civmsvn/svn/repos/workstation_code/trunk@2106 d41079a3-eaa1-4f09-8506-b324c47726bb
Merge branch 'master' of github.com:jamesjcook/workstation_code

Conflicts:
	install/inst-svn_externals.pl

git-svn-id: svn+ssh://civmxsrv2.duhs.duke.edu/Users/civmsvn/svn/repos/workstation_code/trunk@2107 d41079a3-eaa1-4f09-8506-b324c47726bb