Added set -e to all setup scripts
Mods to allow setup-base.sh to be reran if an error occurs