Bluesfest-style rock shows overtake folk at CityFolk