Consolidate config.ini of plugins to main config.ini
Merge branch 'master' into sphinx