emacs24: Let -nox be a whole lot less X than it was

--with-x-toolkit=no still wants to -lX11 when checking for ncurses
zsh: Upgrade to 5.0.2
Merge branch 'master' of github.com:danieroux/nixpkgs