Add conditionals for rbenv and direnv stuff.
Move git branch status to beginning of line.
Merge branch 'master' of github.com:danbee/dotfiles