use short version of git status
add heroku toolbelt to PATH
hot PS1
Merge branch 'master' of https://github.com/vast/dotfiles