Move git PS1 export lower
Simplify git PS1 branch
Merge branch 'master' of github.com:6/dotfiles