Updated emacs configs and bindings
Add icdiff git integration