New vim plugin and git difftool/mergetool definition.
Merge branch 'master' of https://github.com/dyon/dotfiles

* 'master' of https://github.com/dyon/dotfiles:
  Added Dash bundle.