reorganize and add aliases
reformat gitconfig