some changes
Merge branch 'master' of https://github.com/jlopezr/bash-config

Conflicts:
	gitconfig
	local/Darwin