zsh: Fix aptup alias
zsh: Always load nvm and rbenv
makefile: Cleanup symlink targets and include extras in all