vim
Merge branch 'master' of github.com:lleirborras/dotfiles

Conflicts:
	ssh/config