What's in the deal to end the government shutdown for now