Updated .emacs and .gitconfig