update vifmrc to support password input on sshfs
Squashed 'vimfiles/' changes from 49b7e3f..6353557

6353557 Merge commit '7697129d6b024f8ca7b95d300a3de8158c03d878'
7697129 Squashed 'bundle/tagbar/' changes from fd79a17..dbc05b2
05185f2 Merge commit 'f390bbc4249b1a8b84a3bd7c66cd5a3e02083da0'
f390bbc Squashed 'bundle/syntastic/' changes from e67e599..b5050a0
c99f08e Merge commit 'a50616a37402c7216c9c902e3356e2372f1246cb' as 'bundle/ack.vim'
a50616a Squashed 'bundle/ack.vim/' content from commit f183a34
b3870e2 add ack.vim
50016e3 Merge commit '06a9dbe721f2aee6ca5c2e24fade1c67069a5cac'
06a9dbe Squashed 'bundle/neocomplcache/' changes from c7662c1..da44ba4

git-subtree-dir: vimfiles
git-subtree-split: 63535577c4630052eebf12e2404386a4907a5391
Merge commit '4c914b87a6992c0296d3cf6928a11908676f7190'
Squashed 'oh-my-zsh/' changes from 90c28b7..357ab49

357ab49 Merge pull request #2316 from BBonifield/master
f082d7a Making auto-correction off by default
8c93142 Merge pull request #2303 from petervanderdoes/git-flow-avh
6fa64b7 Merge pull request #2296 from pstadler/master
2ffca06 Update git-flow-avh 1.7.0
858c515 source ~/.profile only if it exists
4e34588 Merge pull request #2208 from onemouth/master
032ca0d Merge pull request #2173 from jeffrey4l/venv
7d1b668 Merge pull request #2159 from pungoyal/master
f0a7adc Merge pull request #2176 from dejanlukan/spectrum
b8c1566 Merge pull request #2194 from kevinxucs/gitignore-fix
83c18f8 Merge pull request #2195 from KevinBongart/command_blacklist_for_bundler_plugin
aed9cff Merge pull request #2215 from posva/rand-quote
b422b07 Merge pull request #2255 from shadyproject/plugin/xcode-support
4be8c51 Merge pull request #2258 from amilaperera/master
b764fad Merge pull request #2262 from mfaerevaag/master
cd219f7 Merge pull request #1520 from prooftechnique/master
f974fa3 Merge pull request #1574 from adben/master
a762b3e Merge pull request #1683 from mnme/master
0d35210 Merge pull request #1087 from avit/install-template
de35b55 Merge pull request #1136 from koraa/pull_req_fastfile
4bb8bd8 Merge pull request #1135 from koraa/pull_req_sinchar
1dd9c43 Merge pull request #1134 from koraa/pull_req_helpers
c9dd778 Merge pull request #1201 from koraa/pull_req_debian
5a32796 Merge pull request #2088 from Stibbons/gsemet_push_pep_pylint_completion
19ce09c Merge pull request #2086 from Stibbons/gsemet_push_repo
f48d675 Merge pull request #1883 from Stibbons/gsemet_push_source_profile_for_upgrade
bc79f61 Merge pull request #1866 from Stibbons/gsemet_push_common_aliases
7c3665b Merge pull request #2003 from dongweiming/update-gem
c0a6f8a Merge pull request #1950 from dongweiming/add-systemadmin-plugin
573830b Merge pull request #1947 from dongweiming/add-sudo
2f3bddc Merge pull request #1931 from dongweiming/update-urltools
027c9ee Merge pull request #1942 from dongweiming/update-powify
b93f3b9 Merge pull request #1940 from dongweiming/update-supervisor
44c7fd9 Merge pull request #1928 from dongweiming/add-hist-stamp
f574849 Merge pull request #1927 from dongweiming/modify
533e31f Merge pull request #1956 from emesix/patch-1
3ff772d Merge pull request #2022 from Zhann/master
bbadcf7 Merge pull request #2034 from kasperisager/master
b38db4a Merge pull request #2097 from natecox/master
b6f4a88 Merge pull request #2131 from stevschmid/patch-1
4fc0806 Merge pull request #1030 from solnic/master
7a6caf6 Merge pull request #950 from sonicradish/master
1badb74 Merge pull request #948 from excepttheweasel/master
1c185f0 Merge pull request #946 from rach/master
4954335 Merge pull request #781 from pilif/two-lined-pygmalion
2a43c5e Merge pull request #684 from masnick/master
07594af Merge pull request #639 from MarcoPeraza/git_unpushed
2737289 Merge pull request #513 from randy909/fix-edit-cmdline
3d6f9d7 Merge pull request #306 from jtriley/git-prompt
7f3e56f Merge pull request #2198 from Larandar/master
182652b Merge pull request #2202 from kevinxucs/themes-random
9a40ae9 Merge pull request #2212 from bsiegel/bundler_bi_function
e25329f Merge pull request #2222 from jamesoff/fix-battery-plugin
fb614a0 Merge pull request #2229 from prubianes/master
9357f2f Merge pull request #2236 from Isquariel/nvm
ac83834 Merge pull request #2270 from michaelorr/slow-git-fix
5589741 Merge pull request #2272 from TuiKiken/master
7ee3b27 Merge pull request #2292 from Atem18/master
22c0db6 Change `bi` alias to a function
06bd72f Merge remote-tracking branch 'upstream/master'
84e178f Fixed lines 32, 33, 34 where one 'p' was missing in 'zypper' command.
5643fac Merge pull request #2290 from jtinfors/master
270b1dc Merge pull request #2242 from sztupy/fix-mvn-color-locale
1b337af Merge pull request #2252 from henrique2010/master
259daa0 Merge pull request #2254 from Atem18/master
401c82a Merge pull request #2286 from ych/master
d51cb6d Merge pull request #2260 from Stibbons/gsemet_push_sublime3_support2
b6c6a5a Merge pull request #2285 from dhruvasagar/master
7a27a1c Merge pull request #2240 from Kriechi/master
96bd365 Adds the hgsl alias for one-line shortlog convenience
1493d88 Added migration notification for rails plugin
14005be Merge pull request #2249 from pabrahamsson/obsd_colorls
f078e03 Merge pull request #2275 from wjv/wjv
699c82e Add FreeBSD support for autojump plugin
3d851da Added Amuse zsh theme
b4ffe5c wd.plugin: Added checks, readme and completion
240b25d wd.plugin: Fixed nested dirs
66a33b8 Merge pull request #2261 from webframp/feature/chruby-plugin
fabe23b Merge pull request #2259 from eddiemonge/patch-1
370ccc3 Merge pull request #2266 from ssm/plugin/pyenv
81f9f3c Merge pull request #2271 from ashleyh/master
83462b3 Merge pull request #2273 from thibaudgg/patch-1
7cf34f5 Merge pull request #2276 from christianschmidt/master
ec779d5 Update _pass to follow symlinks for completion
27d048a Merge remote-tracking branch 'upstream/master'
d12113a Use precmd hook for updating OS X proxy icon
b5b3519 Update _heroku config arguments (Heroku Client v3)
7c56364 Add update statistics
4d3fb28 fix pip plugin
fbd479b adding a check for git config option to disable git_prompt_info() on a per repo basis
9b37fcb unified and improved Rails plugin
613d116 Add pyenv plugin
037b39a Add simple plugin for chruby ruby version manager
ae1fe00 Add support for sublime 3
8119234 standardize logic blocks
9f5a895 Merge pull request #2084 from mekanics/update-pod-plugin
d7418f2 Merge pull request #2253 from eddiemonge/patch-1
06021cc Merge pull request #2209 from quodlibetor/pip-caching-fixes
72aa4dd Merge pull request #2257 from mfaerevaag/master
6f48f58 Added wd plugin
1f334ba Rebranded plugin according to Zypper's official alias
3930a63 no tabs in a space-d file
51b273a basic command line xcode functionality
dcf7c7c add aliases to readme
ae6b263 add new alias to zeus
a754084 Add support for colored ls output on OpenBSD
7a7eda1 Merge pull request #2219 from Profpatsch/theme-agnoster
1cc1906 Merge pull request #2244 from marcoccchan/master
8ab8411 Merge pull request #2218 from wari/linuxonly-rename
2b214f1 Merge pull request #2239 from santagada/master
a4f4ed0 Merge pull request #2243 from sabarishcrri/bundle_plugin_nobundle_fix
0f380ea Merge pull request #2245 from cadusk/p3
c6dce05 python3 clean updated.
4e7b0fe getting the projects name correctly and making compdef to work with mux alias
bb2064e Use environment specific open command when creating a new Jira issue.
27f9747 bundle plugin throwing error when bundle is not in path while initializing
96798c4 Fix issues with special characters when running mvn
009b906 agnoster theme not showing virtualenv status
d34ab7f Added the Bureau theme
5c73cb6 Added nvm.zsh to detect current Node.js version
248890b Modification to the frisk theme to work with the BZR lib
efc37c1 Modification to the frisk theme to work with the BZR lib
8cfc7d6 Prevent errors in prompts if no info available. Define empty functions instead of none at all if we can't figure out the platform.
e30a124 Merge pull request #2220 from nishigori/fix-bad-ps-syntax
dd4f570 Fix bad ps syntax in ssh-agent plugin
5718d2b Forgot one symbol for hg.
b2376c3 Merge pull request #1529 from aquaplanet/fix-sshagent-openbsd
7eb2f52 `linuxonly` doesn't work unless renamed properly
0d36ecf Merge pull request #2174 from oxnz/master
37be62f randquote plugin correcting an issue about encoding some people was having added a message when the user doesn't have curl added varibles for colors->easier to customize
008e57a Make the pip cache work with djangopypi2
78df6e9 pip: successfully cache all the packages
c81e42f Update git.plugin.zsh
0eb86f8 updated to the latest version of cocoapods 0.27.1
f731d6c themes plugin now picks a random theme if no argument is provided.
103fc33 Add "options" as a valide 1st argument
1e9f55f Add configuration placeholders to installer template
7567fd7 Re-add whitespace
03dc3a8 Add command blacklist support to bundler plugin
e3c489b Minor gitignore fix.
f057737 Added the spectrum_bls function, which prints all 256 colors set as the background.
500e5a7 add itunes function to control itnues from the terminal
c0c9fc0 Add support .venv folder as virtual env
1dddec6 removing a github redirect during install
05b3ea3 Fix work_in_progress in empty git repos
dfe36d7 Added virtualenv plugin data to af-magic theme.
40b1cf0 repo list search one level deeper
4543852 Completion for python, pep8, autopep8 and pylint
8735dfd New aliases for repo plugin
bdb2cab typo
f6fb348 updated the arguments list to the newest version (0.24.0) of cocoapods
2c56345 Add Pure theme
5bad3f8 Updates Zhann theme
2defe0b Update jonathan.zsh-theme
4d6b59f Add a plugin for systemadmin ops and developer
744f365 Add sudo plugin
426f5f4 Update powify for displayed parameter is not enough, and when there is no directory error
44a26df Add version option
c164f2a Add shell built method
77cf869 Add option for show in the command execution time stamp in the history
d4a9467 Modify determine the oh-my-zsh installed in non-default path of the installed
15509ce Update gem completion
dbcaafd Better super-grep
b832ec9 New plugin 'common-aliases' for optional cutting edge zsh aliases
3f44f51 source ~/.profile for upgrading (to source the proxy configuration)
f358f61 use hostname instead of hostname -s
76e8286 updated adben theme: added offline content, subversion support, refactored prompt
1f4bb8d OpenBSD doesn't have -ef flags for ps. Both linux and OpenBSD have -x flags which works just as greate here
e7f24a8 add symbol in darcs repos to match git and mercurial
1b36c1b Remove debug info
5f37649 Dynamicly generate completion functions to support changing apt_pref
e3c8761 Add myself to the authors list
7d24f4c Use a static apt-get where only apt-get works
0aa4456 Add completion instructions for apt/aptitude commands
8c18f00 Enhance handleing of spaces in filenames
b7bad0f Add the fastfile plugin
0f35726 Make (s)xf not search in current dir
b1977d4 Make grep recoursive
d573cdd Enhance file find
7a338ab Add Man
3af5cf3 Add file finders
67290ff Enhance writing routines
88f3f28 env_defaul=>env_default
6f55994 Add sudo without xargs shortcuts
712f850 Add pager shortcuts
e0b2712 Add download shortcuts
4c0b5c7 Add a description
f970d82 Add cat (+write, +append), enhance formatting
fcb153c Add the singlechar plugin
8f71efc Add helper to easily define default values for variables and env variables.
dbef8b1 Add helper to get the value of an alias only
ce6a21c [themes/josh] Use $(current_branch) in prompt
d49e982 clean up rbenv support for 'fino' theme
7441438 merge changes from offical repo
867cb3f [JM] Removed LSCOLOR Declaration for Wider Support
6272b48 Added New Theme: sonicradish  (256 colors)
bcd5b3b Added a peepcode theme
ff7e064 change the color of arrow when the command line return an error
3445dad correctly handle path names with spaces
7704523 make pygmalion theme use two lines when needed
9e3776f update fino theme to work with rbenv
deb8543 Show if you're ahead of remote in the wedisagree theme
f20cfc6 Fix edit-command-line binding
e5f77b8 add git-prompt plugin from olivierverdier/zsh-git-prompt

git-subtree-dir: oh-my-zsh
git-subtree-split: 357ab4912b98e5ffc14dd62a53b988053d7f9a6e
Merge commit '08f4fe3f411fb1a8af40eb9960c86b0d50393b11'