Jones returns with homer as Braves beat Astros 6-4