major changes in .emacs
changed .gitconfig