Senate agrees two-year funding plan, lifting caps on military and domestic spending