Convert to new JSONConfig class and move most plugins to it.
Merge remote-tracking branch 'origin/master'