(minor) Fix for website changes
Fix --list-channels so it uses the conf hash
(minor) Bring changelog up to date
Update the list of available channels
Add support for BBC Four HD. Lineups to be updated.

Patch provided by Stuart Morgan. Thank you.
update test configuration for the combiner to working channels
switch _eu_egon's test configuration back to the old format channel list for now