completion/prompt madness?
Merge branch 'master' of github.com:atubbs/dotfiles