Maintenance of another system.
Merge branch 'master' of https://github.com/otrenav/dotfiles

Conflicts:
	bash/bash.d/bash_it
	bash/bash.d/inputrc
	bash/bash.d/osx