Standard config update pass

The vast majority of this update is a bugfix patch but typically, Witchery had to come along and add content. :P
Secret new ICBM integration work

At last! \o/

The config was generated from clean copies to avoid damage and weirdness.