Add colordiff and fix some whitespace issues