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

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

Conflicts:
	.Trash/.DS_Store
Merge branch 'master' of https://github.com/yramagicman/dotfiles

* 'master' of https://github.com/yramagicman/dotfiles:
  pull from mac
why was I publishing my bash_history?
Merge branch 'master' of https://github.com/yramagicman/dotfiles

* 'master' of https://github.com/yramagicman/dotfiles:
  add ruby gems to path on arch
  why was that in my tree?
  I just cant find a good mapping for <ESC>