neater ls on first login
Merge branch 'master' of github.com:naggie/dotfiles
Merge pull request #63 from jimjibone/master

Sync with Jim
ps1 spacing
fix typo
Merge branch 'master' of github.com:naggie/dotfiles
removed complete FAIL
remove contains
bashrc now works even if git branch for PS1 is not installed
Merge pull request #4 from naggie/master

fix