Updating emacs config
updating ohmyzsh
git emacs diff/merge tool using ediff
zsh theme mgutz