removed some old things
updated shell config
gitconfig update: auto-rebase on pull-merge
fix