Inputrc and bash function updates for history.
Merge branch 'master' of github.com:brendan/brendan.conf

Conflicts:
	bashrc_global
	inputrc