rename
change location of system gitconfig
Merge branch 'master' of https://github.com/astrails/dotfiles

Conflicts:
	vimrc.after