Merge "Clean up config of tabs and trailing whitespace"