Add pyenv support to zsh
Refine zsh prompt support for rvm and rbenv
* RVM was always reporting when it didn't need to
Git should merge tracked branches by default