Added highlight settings for diff mode, updated .gitignore
Added php-specific settings and incsearch