Consolidate shell files
Update .gitconfig