Remove syntax-highlighting module because it conflicts with lazy loading
of virtualenvwrapper.  See
http://www.zsh.org/mla/workers/2013/msg00434.html
Merge branch 'master' of git://github.com/connanp/dotfiles

* 'master' of git://github.com/connanp/dotfiles:
  This ends up being annoying on some machines with broken dependencies (like mercurial)
  Add restoresession command to pentadactyl Add history function.