Merge pull request #61 from jimjibone/master

fixed some jimjibone problems
git branch on ps1!
Update defaults.sh
Merge branch 'master' of https://github.com/naggie/dotfiles