Whitespace Formatting

Same commit; left out a file. Could go and append this to the previous
commit from the git shell, but meh; using the gui is faster