Change for macosx
Merge branch 'ubuntu' of https://github.com/javiacei/dotfiles into ubuntu
Alias to __git_ps1 removed