better prompt
Merge branch 'master' of https://github.com/tomhrr/dotfiles