Merge remote-tracking branch 'upstream/master'

* upstream/master: (37 commits)
  Added setting of the window title in Cygwin
  Support all kinds of putty-like terminal strings.
  Use shwordsplit in open_command()
  Add empty string parameter to start command
  make this work in the git-for-windows SDK
  znt: twice as fast searching
  znt: updated README.md
  Updated README.md
  Renamed README.txt to README.md
  Add support for "putty" $TERM in termsupport.zsh
  znt: n-history supports multi-line cmds and starts with current buffer
  Fix open_command nohup call
  z plugin: fix loading from custom location
  history-substring-search: update to upstream version 2015-09-28
  history-substring-search: add a script to automatically update OMZ from the upstream repo
  termsupport: protect subshell with quotes
  Drop the use of nohup on OSX for tmux compatibility
  [wd] update minor version (v0.4.2)
  Cleanup gradle plugin file
  gradle plugin: also list tasks in subprojects
  ...

themes/agnoster.zsh-theme

@@ -36,7 +36,7 @@ CURRENT_BG='NONE'
   local LC_ALL="" LC_CTYPE="en_US.UTF-8"
   # NOTE: This segment separator character is correct.  In 2012, Powerline changed
   # the code points they use for their special characters. This is the new code point.
-  # If this is not working for you, you probably have an old version of the 
+  # If this is not working for you, you probably have an old version of the
   # Powerline-patched fonts installed. Download and install the new version.
   # Do not submit PRs to change this unless you have reviewed the Powerline code point
   # history and have new information.
@@ -118,7 +118,7 @@ prompt_git() {
     zstyle ':vcs_info:*' get-revision true
     zstyle ':vcs_info:*' check-for-changes true
     zstyle ':vcs_info:*' stagedstr '✚'
-    zstyle ':vcs_info:git:*' unstagedstr '●'
+    zstyle ':vcs_info:*' unstagedstr '●'
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info