config module refactor
fixed two bugs unknowingly introduced into cinema2k/4k testing
Merge branch 'issue265' into devel