Marcos back in Mexico City; Zapatistas rally at Atenco