Merge pull request #1 from janko-m/master

Useful changes
Add syntax highlighting for vimdiffs
Merge pull request #2 from janko-m/vimdiff

Add syntax highlighting for vimdiffs