Updated gitconfig
Update .emacs to current work version