Update gitconfig
reorganize and replace powerline-{bash,shell}