prompt changes
Merge branch 'master' of github.com:mpillsbury/dotfiles