Updates for new rbenv, re-organized zshenv lines.