Mexico City Teachers End Strike, But Threaten Return