Enable syntax highlighting only when not running in diff mode
More sane diff colors
Fix prompt
Be more posix