Removed conflicts
Removed conflicts
Fixed up icecast stream parser
Added debug filter to logging