Merge branch 'master' into installer-cygwin-support-3

Conflicts: tools/install.sh

Merge branch 'master' into installer-cygwin-support-3
Conflicts: tools/install.sh
96ff8614 · Andrew Janke · 502f08b5 · 76a26a2a · 96ff8614 · 96ff8614
Commit 96ff8614 authored Sep 23, 2015 by Andrew Janke
--- a/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh
+++ b/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh
--- a/plugins/fasd/fasd.plugin.zsh
+++ b/plugins/fasd/fasd.plugin.zsh
--- a/plugins/fbterm/fbterm.plugin.zsh
+++ b/plugins/fbterm/fbterm.plugin.zsh
--- a/plugins/frontend-search/README.md
+++ b/plugins/frontend-search/README.md
--- a/plugins/frontend-search/_frontend-search.sh
+++ b/plugins/frontend-search/_frontend-search.sh
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
--- a/plugins/git-extras/git-extras.plugin.zsh
+++ b/plugins/git-extras/git-extras.plugin.zsh
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -21,7 +21,7 @@
 #
 #Alias
-alias gf='git flow'
+alias gfl='git flow'
 alias gcd='git checkout develop'
 alias gch='git checkout hotfix'
 alias gcr='git checkout release'

--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
--- a/plugins/gnu-utils/gnu-utils.plugin.zsh
+++ b/plugins/gnu-utils/gnu-utils.plugin.zsh
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
--- a/plugins/golang/templates/package.txt
+++ b/plugins/golang/templates/package.txt
--- a/plugins/golang/templates/search.txt
+++ b/plugins/golang/templates/search.txt
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
--- a/plugins/gulp/gulp.plugin.zsh
+++ b/plugins/gulp/gulp.plugin.zsh
--- a/plugins/heroku/_heroku
+++ b/plugins/heroku/_heroku
--- a/plugins/jira/README.md
+++ b/plugins/jira/README.md
--- a/plugins/jira/_jira
+++ b/plugins/jira/_jira