Update vim-gitgutter.
Merge branch 'master' of github.com:lvicentesanchez/dotfiles
Fix conflicts at work.