Update default config based on version 0.8.5
Merge remote-tracking branch 'zozi/update_default_config'
[2.4.0] New default config for 0.8.5 and up (#36)