Just in the nick of time before a new round of tariffs was supposed to go into effect, the U.S. and China have announced a limited deal to end the trade war. Eventually.