Demo cleanup

Some minor tweaks to the contrib/demo/setup.sh script