really not sure what's going on here
Merge branch 'master' of https://github.com/yramagicman/dotfiles

* 'master' of https://github.com/yramagicman/dotfiles:
  really not sure what's going on here
change escape mapping