Travis Shaw returns to Brewers with minor league deal