update setup.sh to match upstream master