don't overwrite config files
add some vdr 2.1.x compat stuff
Merge remote-tracking branch 'upstream/master'
update changelog