Fix git URL aliases
Merge branch 'master' of github.com:holderbaum/dotfiles

Conflicts:
	gitconfig