Add caps lock binding to escape
Merge branch 'master' of github.com:mcnelson/dotfiles

Conflicts:
	.bashrc