Whitespace changes

Switch the code over to a two-space tab (big mess of changes, but here it is!)