City council votes to go ahead with fare integration