San Diego City Council hashes out new rental terms