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

Conflicts:
	.inputrc