Senate OKs bill to avert shutdown; fight not over