Don't use gitslave for my vim config anymore
Merge branch 'master' of https://github.com/Kroogs/dotfiles

Conflicts:
	.gitslave