Move rbenv to zshrc.
Updates and add vim-puppet.