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/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
--- a/plugins/systemd/systemd.plugin.zsh
+++ b/plugins/systemd/systemd.plugin.zsh
--- a/plugins/taskwarrior/README.md
+++ b/plugins/taskwarrior/README.md
--- a/plugins/taskwarrior/_task
+++ b/plugins/taskwarrior/_task
--- a/plugins/taskwarrior/taskwarrior.plugin.zsh
+++ b/plugins/taskwarrior/taskwarrior.plugin.zsh
--- a/plugins/terminalapp/terminalapp.plugin.zsh
+++ b/plugins/terminalapp/terminalapp.plugin.zsh
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
--- a/plugins/terraform/_terraform
+++ b/plugins/terraform/_terraform
--- a/plugins/thefuck/README.md
+++ b/plugins/thefuck/README.md
--- a/plugins/thefuck/thefuck.plugin.zsh
+++ b/plugins/thefuck/thefuck.plugin.zsh
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
--- a/plugins/xcode/README.md
+++ b/plugins/xcode/README.md
--- a/plugins/xcode/_xcselv
+++ b/plugins/xcode/_xcselv
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme