iTerm2 colorschemes
Merge branch 'master' of github.com:Evernight/dotfiles

* 'master' of github.com:Evernight/dotfiles:
  Ctrl+G shortcut
  small changes and vimdiff coloring
  fix for non-interactive bash session