Various fixes to setup.sh
/etc/hostname doesn't like quotes