* upstream/master: (21 commits)
  Fix the setting of $manpath in haskell
  Add a missing backslash
  [Fix #257] Add zstyles from READMEs to zpreztorc
  Fix URLs in tmux documentation
  Set title in screen even when using Apple Terminal
  Increase readability in utility init
  Match BSD ls colors to Linux ls colors
  [Fix #283] Define $LS_COLORS for completion
  [Fix #116] Add documentation for spectrum
  Fix vcs_info zstyles in nicoulaj theme
  Set unused prompts to an empty string
  Fix dirty indicator spacing in peepcode theme
  [Fix #277] Make the peepcode theme status symbol customizable
  [Fix #261] Add documentation for writing prompt themes
  Update sorin theme screenshot
  Change Git branch and prompt color
  Move the vi mode indicator to the left prompt
  [Fix #249] Add documentation for helper
  Rename autoloadable to is-autoloadable
  [Fix #245] Merge trap into helper
  ...

Conflicts:
	runcoms/zpreztorc

* upstream/master: (56 commits)
  Replace table captions with headings
  Replace z with fasd in modules README
  [Fix #244] Add Git special action styles
  Simplify git-log zstyle documentation
  Fix the name of the theme setup function in READMEs
  [Fix #96] Add documentation for git
  Add zstyles for git-log formats
  Rename gk prefixed aliases to gC
  Rename git-info zstyle patterns
  Rename python-info zstyle patterns
  Rename ruby-info zstyle patterns
  Rename editor-info zstyle patterns
  Rename the Git status ignore submodules zstyle pattern
  Rename aliases gSu to gSI and gSU to gSu
  Rename the alias gsc to gsX
  Remove the gig alias
  Fix SSH-Agent casing in README
  [Fix #300] Disable SSH-Agent protocol emulation by default
  Update external completions
  [Fix #129, Fix #211] Add fasd
  ...

* upstream/master:
  Fallback to standard cabal location on OS X
  [Fix #263, Fix #314] Ensure application mode is valid before use
  [#263, #314] Undo revert of "Ensure that $terminfo values are valid"