Remove the long-deprecated 'format' config option
Allow selecting the 5.1-rear channel config from the config file
Reorder some options in the config sample
Remove the unused wide-stereo option
Merge remote-tracking branch 'upstream/master'