Trying to source setup.sh in bootstrap.sh to keep the PATH changes around.  Also, revised bootstrap.sh to only add stuff to PATH if it's not already there