It looks like we decided that our code format is better and made a lot of whitespace changes here.  That's generally not cool.  Let's go back and reformat according to the code style format of the project (which appears to be 4 spaces for indentation).