Adding channel name to m3u file.

VLC!cd and other external players can use this to display the stream name.
Fixed indent.
Merging EXTVLCOPT into one line

Having two of them is a problem for VLC when also using EXTINF. Merging
into one line fixes this.
Merge pull request #194 from fbradyirl/master

Adding channel name to m3u file.