Add zsh, move ruby to rvm