updated setup.sh to merge sensor competition changes (doesn't add paintShell to World.sdf anymore since that is already included in WorldSensing.sdf)