Flattened the settings array pretty much everywhere I can think of, also updated the tests to reflect that
Fix for plugins as well
Merge branch 'feature/flatten-config-array' into develop