City to vote on four-way stops, rezoning