bash prompt
Merge branch 'master' of github.com:dkudrow/dotfiles