Use 'rserv' function instead of server alias
Fixup zshrc and stuff...