Squashed '.vim/bundle/vim-pathogen/' changes from 49e6d62..da1c3c0

da1c3c0 Plug sensible.vim
532f0ca Change :call to :execute
47523d9 Allow for :exe pathogen#infect()
1b46b4f Remove advice around filetype on
e5f413f Promote scriptease.vim

git-subtree-dir: .vim/bundle/vim-pathogen
git-subtree-split: da1c3c08ed67915fd0f09cfaaaf85fc4b3dbf742
Merge commit '157cede08beb7bbd9173af5394397560398dc7a0'
Squashed '.vim/bundle/JSON.vim/' changes from 3c602d4..bb0c195


git-subtree-dir: .vim/bundle/JSON.vim
git-subtree-split: bb0c1957e47a57b2f0fa269a997e7158018c01e6
Merge commit '561faff313f26444c44f49f874eb4d912724b901'
Squashed '.vim/bundle/vim-haml/' changes from b573600..ce0cfed

ce0cfed Merge pull request #44 from jacknagel/compiler
c637b6e Add compiler plugin for haml
b61cfdb Add a compiler plugin for sass

git-subtree-dir: .vim/bundle/vim-haml
git-subtree-split: ce0cfeddbd2825d07a4361ab1871d6970361a1c9
Merge commit 'c77a12643eb9e61a0f44e7caa328048bebd0dd8d'
Squashed '.oh-my-zsh/' changes from d750e7d..80a6032

80a6032 Merge pull request #1510 from agnoster/agnoster-classic
07c19b6 Merge pull request #1517 from thisiskun/master
c5ecb4e Fixes #1489
a09cd71 add unbundled command
e4624c6 Revert "agnoster theme shows error code instead of an "x""
397c085 Merge pull request #1473 from bsteuber/fix-git-flow-feature-completion
bc7157b Merge pull request #1475 from westonplatter/master
d8162cd Merge pull request #1477 from madsgraphics/git_prompt_showstashstate
b9a989f Add Stash toogle to display if there's some stash or not in `git_prompt_status`
f3fea45 fixes #1474 add zeus to bundle exec listx
1b91c84 use feature names instead of failing branch names in "git flow feature"
6d7a275 Merge pull request #1084 from avit/bwana-plugin
046fc5a Merge pull request #1133 from mappleconfusers/605ad8725b06cc15f8523404f59060b6a71bb7a2
083da66 Merge pull request #1139 from mappleconfusers/pull_req_git
ed5d2ff Merge pull request #1233 from mugenken/knife-check-cwd
dc2558c Merge pull request #1467 from timothyandrew/patch-1
4154ecc Merge pull request #1468 from larrylv/unset-config-file-variable
6c5e630 Unset `config_file` variable in oh-my-zsh.sh
f7fc164 Added a `migrate` alias.
178bce2 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
0118b5b Merge pull request #1248 from grahamc/add-symfony
78e3f38 Merge pull request #1258 from caio/git-branch-status
d100354 Merge pull request #778 from rschmukler/plugin-osx
462136a Merge pull request #794 from markdrago/cloud_parameter
5aed0ae Merge pull request #875 from ttddyy/prompt_git-remove
d88fad3 Merge pull request #880 from darrenclark/fix-mac-terminal-app-echo-issue
24188fd Merge pull request #1181 from paulmars/master
dbeb74e Merge pull request #1189 from petemounce/yum-quote
5f41ecd Merge pull request #1186 from r-darwish/history
bd9a860 Merge pull request #1247 from drnic/git-cmds
421a738 Merge pull request #1273 from ystein/master
63deae3 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
868a513 Resolving conflict in merge of #1313
3199d2e Merge pull request #1387 from jimhester/vi-mode-patch
43ca5d8 Merge pull request #1458 from ranman/master
9ae1289 Merge pull request #1454 from gAmUssA/patch-4
b204ce8 Merge pull request #1462 from aliasbind/master
26b3e10 Merge pull request #1460 from tresni/patch-4
2f0717c Merge pull request #1459 from tresni/patch-3
1ad2104 Merge pull request #1463 from syphar/fix_last_working_dir
8925cff Fix prompt color: Change it back to green
98bd19a plugin last-working-dir: create cache-directory if it doesn't exist
e096e40 Print last exit status in mortalscumbag prompt
80f151e urltools for Everyone
39e5c9a Backwards Compatible Jira URLs #1378
b9d5a39 use lazy load for virtualenvwrapper
51e05b7 hg_current_branch added to mercurial plugin
5193a1d Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
f8343b0 Merge pull request #1457 from NeuralSandwich/master
13998bb Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
dfbafe6 Fixing conflict in install scripts
fcc8b19 Merge pull request #1328 from mfoo/master
228c3fc Merge pull request #1301 from bencao/master
ef4e2aa Merge pull request #1293 from cenkalti/master
fdf3a39 Merge pull request #1295 from XL64/master
1f28407 Merge pull request #1298 from nickhutchinson/fishy
ce20cba Merge pull request #1382 from fushunpoon/master
d19e01b Merge pull request #1191 from r-darwish/themes-plugin
275e7cba Merge pull request #1235 from henryyan/master
4cad0a4 Merge pull request #1241 from agrimaldi/git-extras
127a47b Merge pull request #1249 from korjavin/aptitude
aa382b5 Merge pull request #1255 from SuprDewd/master
e89f950 Merge pull request #1256 from seegno/master
96f35e6 Merge pull request #1259 from bwl/sublime-fix
9977afc Merge pull request #1263 from tedv/headless-git
2e5a689 Merge pull request #1265 from aletessier/ssh-completion
ac90eed Merge pull request #1274 from sc68cal/feature/git_decorate_log
215d6da Merge pull request #1277 from waveface/master
44edb3e Merge pull request #1278 from bitboxer/forklift
5991bf3 Fixed Kernel Detection in battery plugin
f28041e Merge pull request #1284 from obmarg/feature/debianwhichfix
66df0f8 Merge pull request #1317 from thcipriani/junkfood_theme
245eee1 Merge pull request #1319 from skatkov/master
93f41fc Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
fe09471 resolving conflict in termsupport plugin
04d0857 Merge pull request #1336 from aelesbao/plugin-systemd
b2b77be Merge pull request #1341 from markusscherer/master
e10552b Merge pull request #1354 from F30/master
5ed75de Merge pull request #1353 from a-b/master
7004ac9 Merge pull request #1371 from rdrey/master
d5eddc6 Merge pull request #1376 from javageek/master
71af4d7 Merge pull request #1375 from dsx/better-pyclean
dad9352 Merge pull request #1378 from hjhart/master
1417111 Merge pull request #1453 from simonoff/master
d3b867d Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
ab13d07 git find
badc3eb Merge pull request #431 from meh/rsync-plugin
423d66d Merge pull request #409 from Bregor/patch-1
c64c30c Merge pull request #214 from allancaffee/master
4fea3ce Merge pull request #1455 from NeuralSandwich/master
e477085 Merge pull request #1456 from sputnikus/master
11ff3b6 Removing mcd as it conflicts with mtools
ef5a65b Renaming cap to capistrano
8fe6ea3 Functions for managing pacman-key
56f0948 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
5f62d2c Added Candy-Kingdom theme
80ab595 Merge pull request #256 from lorrin/no-op_command-not-found
77e4c1c Merge pull request #253 from loopj/master
e226fc0 Added support for Mac to battery plugin
54f1990 Update plugins/sublime/sublime.plugin.zsh
e4a596c Merge pull request #516 from adben/master
27841ca Set default for rvm prompt prefix/suffix
30687c4 Fix RVM loading and RVM ruby version info
f9de644 Simonoff theme
8796fd0 Merge pull request #455 from aslamnd/master
08cb82b Merge pull request #448 from n0nick/patch-1
7dfd640 Merge pull request #1451 from rmcastil/modify_readme_to_clarify_the_manual_way
31ad213 Merge pull request #1452 from miry/github
f29daef Fix repo for github.
60c3813 Make the NOTE an optional for improved instructions
5b20146 Improve formatting of step 2 for clarity
22f827e Merge pull request #1393 from agate/patch-2
2e55825 Merge pull request #1365 from pcasaretto/add-heroku-remote-switch
b8e2302 Merge pull request #1366 from op/last-working-dir
9a88e76 Merge pull request #1370 from ericmathison/syntax-fix
f9c1a72 Merge pull request #1347 from paulredmond/plugin/jira
aad58af Merge pull request #1386 from sanbor/master
e3b97db Merge pull request #1390 from pluton8/bugfix/autojump21
2aa485a Merge pull request #1435 from Drarok/fix-svn
3657bf8 Merge pull request #1421 from cristim/master
25a2f02 Merge pull request #1399 from tresni/patch-1
08efdcd Merge pull request #1400 from tresni/patch-2
66e784c Merge pull request #1416 from talmuth/master
26d4654 Merge pull request #1410 from jimhester/per-directory-history
ddb8d46 Merge pull request #1411 from niceview/rvm
f2050fc Merge pull request #1413 from arnihermann/master
29b66b8 Merge pull request #1412 from jdavis/coffee_plugin
5189cb8 Merge pull request #1418 from Mehonoshin/patch-2
bc1a06a Merge pull request #1419 from ssrihari/master
293a65c Merge pull request #1439 from maxbane/master
3dc1d92 Merge pull request #1442 from willman500/git-hub-flow-plugin
f69b05b Merge pull request #1445 from knxroot/master
ded745b Modifying documentation in zshrc template for new config option
533a281 Merge pull request #1430 from danielsoneg/egd-update_frequency
8a2314e Merge pull request #1437 from Partyschaum/master
067178d Merge pull request #1446 from suzaku/patch-1
263107e fix typo
3b6fae1 Node.js version of urltools es more fast (53% aprox), you can try this with strace -o trace -c -Ttt
1b4393f Add autocomplete for git "hubflow"
5c98325 fixed autojump: autocompletion works with homebrew again
12f416b Merge branch 'master' of github.com:Partyschaum/oh-my-zsh
5d6252c fixed autojump plugin: works with homebrew again now
5385475 Revert "Fix to restore bindings after switching to vi-mode"
3d76228 fixed symbolic-ref git view of agnoster theme
7fc612b removed 'x' from prompt_context() function name
120db35 Fix the backwards svn status, and add comments explaining which way grep does things.
79e620c Whitespace cleanup.
200a258 Add UPDATE_ZSH_DAYS setting
7c76854 Added a small mod of the tjkirch theme
b2b5e3a Added alias to rake db:test:prepare
7991562 Added gwc(git whatchanged alias)
af729cc Add support of screen-* $TERM in screen plugin
003b0da Use pull --rebase for 'gup' shortcut.
6c45d21 Added host to prompt
6f6a3c8 Added sf Symfony2 binary alias
4c96e53 Added a CoffeeScript plugin.
7d9518d Use rvm completion from ~/.rvm/scripts/zsh/Completion
9ba7991 Replace reset-prompt with push-line and accept-line
1b768a3 Update plugins/svn/svn.plugin.zsh
99468cb Update themes/minimal.zsh-theme
ec9b550 Update plugins/git-flow/git-flow.plugin.zsh
cd0e7c5 Fix sourcing brew's autojump of version 21.0.3+
4e513d7 Fixes for vi-mode terminal overwriting bugs
15563c1 Added pass plugin in order to provide completion.
263446d Expand for-loop so that it works under Snow Leopard Terminal.app.
1c9f2e8 Update plugins/jira/jira.plugin.zsh
4d8fe54 Updated code from answer URL
c592f55 Added ability to specify list of directories for pyclean to override default current directory
7e2156a Fixed node-docs
b0cf067 Fix color syntax
91e5619 Added last working directory plugin
c2cbd31 Add the heroku --remote switch
2fa0262 add git-extras plugin
3ad138a Merge remote-tracking branch 'upstream/master'
daa6ece Set the '-R' option for less not in $PAGER, but as $LESS.
8f7b126 updated symbol
53412de Something to be said for symmetry
5872dae spacing makes me something
2ba668b parens tweak
bb5db62 removed weird characters
8d86bb2 moved spacing
af21abb Wrong URL :zap:
43bd46b fix title setting bug in xterm and urxvt
58d904a Added systemd plugin with aliases for systemctl commands.
2365784 Merge remote-tracking branch 'upstream/master'
5e0fd9b Add user-local installation autojump zsh plugin source
00bff0a Red prompt for remote hosts
8ecc252 Last spacing adjustment...I swear
9510eb0 Modified spacing one last time
55c6901 Replace cp verbose with rsync
a8d4260 modified spacing on junkfood theme
b534b38 Added fat arrow the theme
00e1199 Added space to prompt
11a4c67 Added junkfood theme
28d28ee git plugin: Add `gpoat` alias
ce74be1 Merge remote-tracking branch 'upstream/master'
6c13721 Merge remote-tracking branch 'upstream/master'
cfeb570 Nuke _cap_does_task_list_need_generating
fa859f9 fix rvm auto complete, pointing to $rvm_path
2643ac9 Update fishy theme to collapse working directory in PROMPT.
28d3b80 Add empty function rbenv_prompt_info() if doesn't exists
d5e5b7e search virtualenvwrapper.sh in PATH
6f92745 Added another path for virtualenvwrapper plugin
f995218 Add keep branch option.
d3f6507 Debian plugin now pipes which stderr to stdout
36b4201 new forklift plugin
74faabb Add shortcut for showing log of all branches
9172b3a fix typo in cd-wrapper
9af7f86 Correct variable used for global ssh known host completion
027fccc Make git use sha when branch name is missing.
a3c2a2f Add branch status support to git_prompt_status
aaf705c Adding logic for ~/Applications folder installs of Sublime Text 2
75029cd Added a "please" alias for sudo
e709642 Merge branch 'master', remote-tracking branch 'rr/master'
a8d7958 alias at=aptitude broke /usr/bin/at scheduler. Just an idea: change it to ap
772bc51 Merge
61e708f Adding a symfony plugin, for symfony 1
73df0c8 added 'gcl'for 'git config --list'; and gd for 'git diff'
1e1e0fa Fix changelog --list completion bug
46b88b6 Added credits
0b75782 Added git-extras completion
98ecfa4 Bwana plugin for reading man pages in Safari
3fe1e5c add maven zsh autocomplete plugin, copy from juvenxu's bash maven autocomplete plugin
bb34abd check for knife.rb in cwd
4a11d2c merge from upstream master
f7b1615 Added completion to the theme selection plugin
5e9a16b Added themes plugin
62a436b Fix mismatched quote in yum plugin
8ba97c3 Added history plugin
8088e8a add git remote branch autocomplete
3dd3c1f Add aliases for git-remote: gr...
e9feccf add maven plugin
605ad87 Add a cat smilie as alias for cat
814ecfc delete time filed
7ffc3e7 change color of @ to cyan
bd4f1ee add hostname behind username, example: henryyan [02:07:20]  ~/.oh-my-zsh git:(master) ✗
c1e9d92 move kafeitu.zsh-theme to themes folder
09c5996 Added kafeitu theme it modified by robbyrussell
8f89d4d Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes
52733cb prompt git-remove as deleted
dafef0b Merge branch 'master' into cloud_parameter
95971a2 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into cloud_parameter
e3c34b4 add ability to set custom prefix for cloud theme
4a813cf Added vsplit_tab and split_tab for iTerm. Create new session within a vertical/horizontal split of the tab respectively.
ebbead8 RVM info
878d569 FrontCube theme with git status
efa5593 Rename to _capistrano (completion only)
3bc32ee add theme with command-line tips support
0ba398f Merge in recent stuff
1d17502 rsync: add rsync- prefixes and use aliases
b727e33 Updated the frisk theme to display Bazaar branch information as well (based on zedtux.zsh-theme http://j.mp/ikTZJj)
c5a01fe rsync: add plugin
b02094e Change plugin name from cap to capistrano
f045119 Dollar sign instead of percent in unprivileged user prompt (as in real gentoo)
25adbe8 Aliases
3b8f654 Fixed cap plugin
e8a7a31 Make command-not-found no-op when support not available (e.g. not on Ubuntu)
a15a8c4 New theme 'intheloop' which demonstrates the git_remote_status function
2d5412e Added new function git_remote_status to check if we are ahead, behind or diverged from the remote branch
8aec32b Add vagrant completion for individual VMs

git-subtree-dir: .oh-my-zsh
git-subtree-split: 80a603259657acab97badbae20003b5a34c901f9
Merge commit '4560530e917c7cd2e0e2c3d65b5908ed752a5725'
Creating update script, updating install script.
Actually adding the install file changes.
Squashed '.vim/bundle/zencoding-vim/' content from commit 8c108ad

git-subtree-dir: .vim/bundle/zencoding-vim
git-subtree-split: 8c108ad27d2b8d3fdec54dee7a4eae1b3cbef138
Merge commit '503e5a236b9dc21ba365e69229750522644cea1d' as '.vim/bundle/zencoding-vim'