Congress reaches short-term spending deal