In what year did San Diego become part of the United States