The Giants wanted Wilmer Flores back and Flores wanted to return. The two sides have reached a deal that will keep him around at least two more seasons.