jk is now escape
Merge branch 'master' of github.com:pertrai1/dotfiles

* 'master' of github.com:pertrai1/dotfiles:
  merge conflict highlighting