whitespace cleanup and pngcrush

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