Fix lots of whitespace errors

I unintelligently set my text editor to remove trailing whitespace from
the files I was editing. Now, in a side branch, I have a huge diff made
even worse by the whitespace changes. This helps reduce that.
Temp backup commit, don't be pulling this stuff