Modified:

* modes.el

  added a hook to magit mode so that evil mode is turned off locally

* keys.el

  added a keybinding so that C-g exits insert-mode in evil