updating to use a kdiff as diff tool
Merge https://github.com/drinkspiller/dotfiles