cleanup resultant whitespace and key/value alignment in config files
 - fix tests related to whitespace changes
nits