Water deemed safe ending week-long boil order