hasty commit without summary
hasty commit without summary
Merge branch 'master' of github.com:rafpaf/dotfiles

Conflicts:
	bashrc.d/bashrc.fix_hostname