Useless now
Merge branch 'master' of github.com:xrobin/dotfiles

Conflicts:
	base/gitconfig.symlink