Wal-Mart completes Massmart deal