The Senate committee also protected the National Weather Service staff from mass layoffs. But a fight over the FBI has left the bill in limbo.