Added more tolerance for config whitespace

* This can also make the config file prettier

Change-Id: I7f2a927b3d860ead1710a057096d1e396354e93a