Who controlled San Diego's charter for 2 years after it was revoked by California legislature?