change escape mapping
Merge branch 'master' of https://github.com/yramagicman/dotfiles

* 'master' of https://github.com/yramagicman/dotfiles:
  change escape mapping

Conflicts:
	.Trash/.DS_Store