1 breaking bug fix and 1 typo

- largeFile-setup.sh corrected to call simple-setup.sh and not
  merge-setup.sh, the script's original name.
- gitDemo.sh makes reference in one of the commit comments to a
  client-specific naming convention. Nothing major, but removing it
  for consistency's sake.

gitDemo.sh

@@ -6330,7 +6330,7 @@ declaim "Developer 1 updates their 2nd release branch working area following the
 cd ${BASEDIR}/javaBootcampNoEclipse.dev1
 git fetch --prune
 git checkout REL2019.02_dev1
-git merge -m "Updating my dev branch with the 18.5 release" origin/REL2019.02
+git merge -m "Updating my dev branch with the 2018.11 release" origin/REL2019.02
 git push origin
 
 sleepies 15

largeFile-setup.sh

@@ -13,7 +13,7 @@ declaim () {
 
 REPO_DIR=${SCRIPT_DIR}/largeFileRepo
 
-${SCRIPT_DIR}/merge-setup.sh ${REPO_DIR}
+${SCRIPT_DIR}/simple-setup.sh ${REPO_DIR}
 
 cd ${REPO_DIR}