Severe thunderstorm watch ends for Guelph, still in effect for