Don't conceal quote for JSON
Squashed 'vim/vim.symlink/bundle/vundle/' changes from 9411586..6545681

6545681 Resolve full doc dir path when running helptags
8dc18e4 Merge pull request #427 from mb1986/patch-1
ec16b7b fix typo in line no. 205 of README.md
d690c77 Merge pull request #421 from Keithbsmiley/master
e2bf911 Fix incorrectly aliased VundleInstall command
90dd826 Merge pull request #416 from lucc/api
bb53f89 update deprecated API to call the new API directly
bf70a15 Merging in new plugin interface.
0521de9 use Plugin instead Bundle
eb5ae19 Merge pull request #408 from starcraftman/fix_interactive
21326e1 Fixes issues #407.
e6bcdfa Merge pull request #406 from gmarik/bug/keep_all_config_on_install
a30bedf Make bundle options visible to installer
938cd59 Merge pull request #242 from techlivezheng/feature/use-global-bundles
2d2690e Don't touch 'ignorecase'
2b0ae72 Use the global bundles instead of reinitializing

git-subtree-dir: vim/vim.symlink/bundle/vundle
git-subtree-split: 6545681f560eb174c722cbf74b890d409c79293f
Merge commit '64c50a95e04fcddc7f8d6eba63cc0719682a88bc'
Squashed 'oh-my-zsh/' changes from 86a272e..f8f0126

f8f0126 Merge pull request #2685 from delynn/patch-2
7d696f7 Remove mailcatcher
00d6ef8 Merge pull request #2329 from pstadler/brew-cask
70dfb91 Merge pull request #2663 from bobmaerten/docker-autocomplete-updates
fe73f8d Merge pull request #2651 from jehrhardt/fix-emacs
175310a Merge pull request #2661 from mcornella/fix_title_tab_percent
ae0c650 Merge pull request #2659 from simonc/allowing-pow-path-with-spaces
861d380 Merge pull request #2658 from leifcr/rake-fast-issue
27c28a9 Merge pull request #2647 from bobwilliams/master
78967b6 Merge pull request #2656 from philenotfound/master
a6b9597 Merge pull request #2652 from lukehorvat/patch-1
a5f6f72 Merge pull request #2660 from KevinBongart/add-readme-to-rake-fast
9c1241a Merge pull request #2662 from aeriksson/master
400643f adding urldecode_json to compliment urlencode_json and updating readme.md; slight tweak to urlencode_json from previous commit
0605d53 adding urlencode_json and associated README.md details
76e1edf Matching autocomplete for Docker v0.9.1
9650861 Fix broken reverse-menu-complete keybinding.
982b534 adding the is_json tool and associated readme.md details
5137e0e Escape % in $CMD variable
7b08f49 Add README file to rake-fast plugin
015b742 Allowing path with spaces in pow plugin
9eadaf5 brew-cask plugin: use spaces instead of tabs
aec73f6 Merge branch 'master' of github.com:philenotfound/oh-my-zsh
4446787 New aliases for 'apt-get' and 'aptitude' as they were overwritten by later aliases
64bb1a2 adding support for node
a3b357a Adds command line aliases useful for dealing with JSON
94a5cc5 Updates spectrum.zsh
732bca0 $ZSH is the OMZ installation folder, not configuration
2697a18 mention $ZSH_CUSTOM as suggested in #2295
ffd5cb2 suggest setting $LANG to fix #1286 and fix #1823
c0e3c55 Fix export syntax of $GREP_OPTIONS
c1ada7a Rendering the 'vagrant box (remove|repackage)' completion code independant of Vagrant implementation details.
8194aa9 application completion
bc02c28 library completion
0f32083 in hindsight, this is probably a bad idea
ee3a20a completion of targets
fd3d5bf instance and cluster completion
6d7d131 node completion
f88b6bd help command, node completion
95f8319 added _files values for certain options
9b4cf96 completion options
f644d2e added alias
4dcdd13 added completions for all known arguments to all known commands
7daf2f4 apparently, this file must exist for the plugin to load
1988958 added completion for all asadmin subcommands
d2a765e avoid VCS folders
d1323ed Move example plugin to the custom plugins dir.
7a94b76 Add completion for pip install -r - so that it autocompletes requirements filenames
ee8f9ee Added an <esc> to the begining of everything. I ran something when I was in insert mode once and all it did was shove !args... into the buffer.  <esc> first.
46c2af3 Updated the README to include documentation on the postCallVim callout
5a81fda Added an optional callout to the end of the interaction function. I put it in to allow me to put the window focus on MacVim / GVim depending on the different OS I happen to be on
83071a1 Fixed: If you callvim on a non-existant file with a relative path, the CWD of the running gvim process is used, and that's not right.  We use the PWD explicitly instead, in this case
cdea478 A plugin that makes it easier to interact with the (single) running instance of gvim
8d1fa09 command to restart pow process
640e5da added powed command to list pow urls
48e53fb fix gnzh theme to detect local rvm installations
c70fcd6 Added link to wiki page for plugins to README.
95ffb16 Add gem build autocompletion
b578eea `setopt append_history` is not necessary.
48f8f28 Plugin: Rake-fast: Support both *nix and Darwin
37e619e New aliases for 'apt-get' and 'aptitude' as they were overwritten by later aliases
5f09d0f Fixed typos + made wording more consistent in zshrc.zsh-template
64c3ce3 adding xargs -0 to node aliases
f8890f5 updated readme.md and using tab char for formatting with node
8db3e63 bug fix for node pp_json version
c451ff4 Add check for display list equals nil
1fc40c6 updating README.md
3bae9dd adding README.md for jsontools
ffc17b6 Merge pull request #2563 from bobwilliams/master
27965fe Merge pull request #2390 from LFDM/updating_spectrum
47ad242 Merge pull request #2645 from ncanceill/template-zshrc
1ca4e21 Merge remote-tracking branch 'upstream/master'
6889dfa $ZSH is the OMZ installation folder, not configuration
04c2d29 mention $ZSH_CUSTOM as suggested in #2295
f9ad368 suggest setting $LANG to fix #1286 and fix #1823
315099d Merge pull request #2643 from mcornella/patch-1
d70e732 Merge remote-tracking branch 'upstream/master'
12e30fa Fix export syntax of $GREP_OPTIONS
178b522 Merge pull request #1302 from cybozuty/master
c4727ab Merge pull request #1262 from fred-o/glassfish-plugin
393c805 Merge pull request #1162 from nXqd/patch-1
668886e Merge pull request #1117 from Peeja/move-example-plugin
5540daf Merge pull request #967 from wjlroe/pip-requirements
7550436 Merge pull request #1022 from derekwyatt/master
ae1f331 Merge pull request #1005 from cmar/powed
ae1a9e2 Merge pull request #995 from wting/fix_gnzh_ruby_detection
fff49ae Merge pull request #990 from tommorris/master
d4e907b Merge pull request #973 from dlee/gem_build
9eacd7d Merge pull request #750 from blueyed/history-drop-default-append-history
d41c588 Merge pull request #672 from eMxyzptlk/zsh_reload
d8a5fff Merge pull request #662 from walle/add_autocomplete_for_gas
95302af Merge pull request #646 from whittle/master
319aafc Merge pull request #2618 from bdubertret/fix-gwip-norm
23fe53e Merge pull request #2634 from danchenkov/master
73fd066 Merge pull request #2638 from miguelfrde/irb
d968397 Merge pull request #2605 from mhauserr/patch-1
1235103 Merge pull request #2615 from erbridge/fix_virtualenvwrapper_lazy
c97aff8 Merge pull request #2616 from Bounga/master
e0e4c0e Merge pull request #2620 from reedriley/master
2e74fe7 Merge pull request #2619 from korylprince/master
610655e Sort bundled commands alphabetically
2403b05 Merge pull request #2440 from m0nah/master
e742073 Merge pull request #2510 from pavoljuhas/master
2e06412 Merge pull request #2531 from KevinBongart/rake-fast
6d616de Merge pull request #2637 from aforty/master
184e93c Merge pull request #2627 from loxley/add_knife_vault_cmd
c98883f Merge pull request #2631 from AntoineD/master
c137c7b Merge pull request #2639 from jieryn/master
1509ac9 add common video formats FLV and WEBM
c3150ed Add irb to the list of bundled commands
69fa67c Merge pull request #1 from KevinBongart/brew-cask
6a8f83b Add new brew cask commands
32a7824 Added a forward-delete fallback to bind Delete key
5f31190 atom plugin
c5413d7 Aligned comments
55a9d68 Update key-bindings.zsh
e537ee9 added terminfo keys verification
ef343ee Fix dirpersist plugin
fb2d6eb Fixed errors if acpitool isn't installed on linux
645fceb Add chef-vault knife cmd support
c1c107c Add scd plugin for smart change of directory.
6952105 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
d3babe0 Don't show useless '[]' when chruby_prompt_info is empty
a869ec9 Fix gwip alias in git plugin when no files to rm
5a58667 Merge remote-tracking branch 'upstream/master'
baf2ab1 Don't set RBENV_ROOT to "$HOME/.rbenv" when using Homebrew rbenv
ca90021 Merge pull request #2576 from jeffwilliams/master
81d53af Merge pull request #2597 from githubhjs/master
3be2e34 Don't lazy load the virtualenvwrapper.
12415a9 Merge pull request #2539 from chriswiggins/master
dcae31d Merge pull request #2549 from brandon-beacher/master
23a43e9 Merge pull request #2574 from thiagowfx/linux-battery
080409a Merge pull request #2603 from docwhat/ssh-agent-hostname
fed8076 Merge pull request #2607 from avonderluft/dev
8ee9971 Merge pull request #2613 from Fisiu/ignore-ssh-users
baeac5b Remove copyright information, as per #2588
b56e8fb Ignore more users in ssh completion.
c9e7129 Merge pull request #2602 from blueyed/use-default-hosts-completion-2
bf4d4db Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into dev
8f79713 add option to show dirty status of current dir
223fd60 Merge remote-tracking branch 'upstream/master'
9e90bf0 Added v as a keybinding to edit-command-line
ee21fe9 Merge pull request #2380 from rkh/chruby-gallois
8d8df3f Merge pull request #2435 from tompelka/master
d943d23 Merge pull request #2466 from jarus/steeef-virtualenv-fix
07c2bdf Merge pull request #2588 from kerimdzhanov/remote-themes-copyright-info
d752c8c Merge pull request #2584 from joukojo/master
3b604c6 Merge pull request #2590 from zhouhua015/master
d058c9d Merge pull request #2593 from bobmaerten/typo-docker-plugin
552aab6 Merge pull request #2591 from kevinxucs/remove-extra-aliases
cfe468f ssh-agent: prevent environment file from flapping
47b0d75 Fixing a few quirks in the latest installer updates (quoting /Users/robbyrussell/.oh-my-zsh and such). Also mentioining our twitter account after install
71d9420 Use zsh's default for ':completion:*:hosts'
de78e47 Merge pull request #2149 from cristim/master
7adf66f Merge pull request #1355 from F30/key-bindings
ca648ae Merge pull request #2072 from jorge-d/master
d65a153 Merge pull request #2595 from ksamdev/git.io
d0dcedc Merge pull request #2421 from LFDM/rails_plugin_fix
7c95518 Merge pull request #2518 from erawk/master
0d76d9e Merge pull request #2326 from zakkak/master
e8b85f9 Merge pull request #1776 from ronshapiro/master
a5df4d7 Merge pull request #1501 from gambhiro/master
9cb14dc Merge pull request #1085 from avit/install-path
d8ed8f6 Merge pull request #650 from tristan0x/emacs
9272b0b Merge pull request #2600 from jontewks/patch-1
5f5e550 Update license year
b6cbba9 Updating README to show the new install URL, which redirects to the raw files on github.
ae2f6f3 List pkgs by size
b9841b0 Add github url shortener
3c9a29b Fix typo in autocomplete arguments
b71a2b9 Removed unsolicited aliases.
de0e7b5 Fix hgsl alias.
9f66d5b Document alternate install paths via ZSH variable
da1fa3b Abort installer on errors
2e11e2a Write install path into .zshrc
5bd590c Reference default install path from ZSH variable
c249c69 Remove all copyright information in themes. Closes #2587
fd8ce7f added mvnjetty alias
7378765 added aliases for tomcat:run tomcat7:run
8b667b2 added mvn-update
c0b98cd Added dirhistory plugin.
564a708 added the linux implementation to the battery plugin
185cb6e adding support for node
56babe6 Adds command line aliases useful for dealing with JSON
840ae43 Remove mailcatcher from the bundler plugin.
fdd864b Update battery plugin to show calculating - OSX
1a029f2 Add rake-fast plugin for fast rake autocompletion
f3f0a54 Updated _brew zsh autocompletion to latest Homebrew upstream
ed19ffe Add scd plugin for smart change of directory.
3d41804 Improve virtualenv prompt in steeef theme
7b9e489 Add Laravel4 plugin
23e57c1 Adding commit hash to branch name in my favorit rjk-repos theme.
a667191 Fixes _rails_command
288604e add brew-cask plugin
6a40557 Updates spectrum.zsh
f6bb74e add chruby info to gallois theme
e978119 Improve comments
be6b1b3 Improve comments
190fcdf Added a completion plugin for the new aws-cli tool
90b83b8 Add completion for package add and remove
dd22015 Add autocompletion plugin for meteor command
ae1973d plugged_in function
c95b6d9 git lol
46ad733 more catspeak
174c917 Replace hardcoded key escape sequeneces with dynamic ones from terminfo.
ff0cafa Make sure the terminal is always in application mode when zle is active.
3839c6e Don't clobber standard Esc+. behavior
f7708d4 forgot to save before committing. doh
68cec79 Added documentation to key bindings.
97ec5de Rendering the 'vagrant box (remove|repackage)' completion code independant of Vagrant implementation details.
265b2a5 application completion
c24d7f7 library completion
8f0c617 in hindsight, this is probably a bad idea
a4e6a2c completion of targets
fb3cae1 instance and cluster completion
0ebeb56 node completion
b49c97e help command, node completion
e4ffac1 added _files values for certain options
4caea1f completion options
df176fb added alias
350720e added completions for all known arguments to all known commands
d2116f3 apparently, this file must exist for the plugin to load
4d0c135 added completion for all asadmin subcommands
4f9cfee avoid VCS folders
af03da0 Move example plugin to the custom plugins dir.
8762b27 command to restart pow process
94dd651 Added an <esc> to the begining of everything. I ran something when I was in insert mode once and all it did was shove !args... into the buffer.  <esc> first.
c2e459a Updated the README to include documentation on the postCallVim callout
04a7536 Added an optional callout to the end of the interaction function. I put it in to allow me to put the window focus on MacVim / GVim depending on the different OS I happen to be on
92227f1 Fixed: If you callvim on a non-existant file with a relative path, the CWD of the running gvim process is used, and that's not right.  We use the PWD explicitly instead, in this case
e652756 A plugin that makes it easier to interact with the (single) running instance of gvim
aefacb6 added powed command to list pow urls
4a88743 fix gnzh theme to detect local rvm installations
071d0d6 Added link to wiki page for plugins to README.
fa1657e Add gem build autocompletion
c9c0214 Add completion for pip install -r - so that it autocompletes requirements filenames
98578ec `setopt append_history` is not necessary.
40508b7 Add zsh_reload which provides src function, this function will source .zshrc and rebuilds cache
be6f0c9 Update the script to account for the changes in 0.1.7 where .gas is a directory
a01b1fe Do not overwrite EDITOR environment variable if already defined.
3a408f3 Comment
db90589 Merge remote-tracking branch 'upstream/master' into emacs
7066bf7 Fix builtin `ecd' when file path contains space characters.
de29ef8 Change default zshrc to export $ZSH (as required by check_for_upgrade.sh).
574de93 New function `efile`
6f1929f Fix indentation
9b29136 Fix alias `eeval'
49c0a13 - Fix pass of parameters - Add new function `ecd'.
a183bcb More comments
5d90f58 I should not have merged this here.

git-subtree-dir: oh-my-zsh
git-subtree-split: f8f01262ab19edcbed40fd77d959b64408ea81e2
Merge commit 'a080de70a157abc590caa5e142185d7756409b67'

Conflicts:
	oh-my-zsh/plugins/debian/debian.plugin.zsh
Arch'ify the maven patch
Disable git-status. Not working with Arch