City votes to expand social host ordinance to include marijuana