added some peforce stuff to prompt if in a perforce dir, and something to do with dircolors that I don't remember
Merge branch 'master' of github.com:MatthewCox/dotfiles