Speed up and simplify config file reloading
Merge pull request #4756 from atom/mb-speed-up-config-loading

Speed up and simplify config file reloading