Fix --skip option and add a more consistent CSS formatter.

The skip option had some issues and I tried to get too fancy with the CSS formatter. The diffs should be more useful now.