whitespace cleanup and pngcrush

This is initial cleanup I've done before getting to the nitty-gritty of my fork.  Doubtful that any forward mergers will be trivially mergeable.