Merge branch 'master' into fold-terminalapp-plugin-into-termsupport

00eb4658 · Andrew Janke · 47d19cc5 · 192de6bc · 00eb4658 · 47d19cc5
Commit 00eb4658 authored Aug 17, 2015 by Andrew Janke
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
--- a/plugins/rails4/rails4.plugin.zsh
+++ b/plugins/rails4/rails4.plugin.zsh
--- a/plugins/sublime/README.md
+++ b/plugins/sublime/README.md
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
--- a/plugins/systemd/systemd.plugin.zsh
+++ b/plugins/systemd/systemd.plugin.zsh
--- a/plugins/taskwarrior/_task
+++ b/plugins/taskwarrior/_task
--- a/plugins/taskwarrior/taskwarrior.plugin.zsh
+++ b/plugins/taskwarrior/taskwarrior.plugin.zsh
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
--- a/plugins/terraform/_terraform
+++ b/plugins/terraform/_terraform
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
--- a/plugins/tugboat/_tugboat
+++ b/plugins/tugboat/_tugboat
--- a/plugins/ubuntu/readme.md
+++ b/plugins/ubuntu/readme.md
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.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