Wrap over-80 lines; remove trailing whitespace
Remove more trailing whitespace

*Somebody* was using Bluefish.