Tidy up. Vimdiff is now default git diff tool. Remove unused keybind.
Merge branch 'master' of https://github.com/Teotoo/dotfiles