Change push setting
Fix the PS1
Merge branch 'master' of github.com:kwbeam/dotfiles