Updates and preferences changes
Updates
Merge branch 'master' of https://github.com/otrenav/dotfiles

Conflicts:
	bash/bash.d/bashrc
	bash/bash_profile
Installed and made changes in second computer