Git config
version of .vimrc on this machine
Merge branch 'master' of github.com:mheiber/dotfiles

Conflicts:
	.gitconfig
	.vimrc