Added new prompt features
Merge branch 'master' of ssh://github.com/pavpanchekha/dotfiles