Update submodules

* .ls_colors 646eafd...b90704c (17):
  > add 3gp and 3g2
  > add .deb and .apk (android package thingy)
  > add .mht (MIME HTML archive)
  > add .divx
  > add .cc for c++ and .m{,m} for cocoa (closes #15)
  > add clisp extensions (closes #14)
  > tree(1) uses NORMAL for resetting attributes, disable NORMAL for now (closes #11)
  > cleanup, v0.240
  > add some more build stuff
  > add f4v
  > add state file
  > adjust mp4 color
  > add nokia theme archive (.nth) and symbian installation file (.sis)
  > have *.r{00..116} use the same color
  > update README with install instructions (closes #13)
  > add .pyc compiled python code (closes #10)
  > add .hi files for Glasgow Haskell Compiler (closes #9)

* .urxvt/urxvt-font-size ace6d6e...3abbfec (4):
  > Try handling fonts without specified size, closes #5
  > Better handling of unset fonts, closes #3
  > Handle all ways to specify font size, closes #2
  > Replace x11 with xlfd

* .urxvt/urxvt-perls a7dd819...adacf79 (2):
  > Add support for the Git URL scheme
  > Fixed issue #35

* .vim/bundle/ack fd9632b...f183a34 (13):
  > Merge pull request #69 from jeremyckahn/patch-1
  > Merge pull request #65 from alexbel/master
  > Revert "enqoute the grep args"
  > Merge pull request #55 from blandinw/patch-1
  > Merge pull request #47 from troydm/master
  > Reindent
  > correcting hsplit mapping in readme
  > adding silent mode and updating doc
  > fixing vertical split mapping and adding horizontal split
  > escaping quotes
  > enqoute the grep args
  > Allow users to disable custom bindings.
  > Make the quickfix/locationlist handlers configurable.

* .vim/bundle/clang-complete d41dfae...5ce0d12 (56):
  > Workaround issue #297
  > Objective-c++ files were considered as c++ files.
  > Merge pull request #311 from Rip-Rip/goto-definition-same-tu
  > Merge branch 'master' of git://github.com/daedric/clang_complete into daedric-master
  > Add options to control "jump to declaration" key mappings.
  > Fix canFindBuiltinHeaders if index.parse fails.
  > Index.parse doesn't return None on failure.
  > A NULL pointer returned by libclang shouldn't be compared against None.
  > Introduce a new snippets API.
  > Fix a nasty typo.
  > Alert the user whenever goto declaration is used and the file is not saved.
  > Add support for goto-declaration.
  > Add Tobias to the license, and slightly reword it.
  > Update the doc.
  > Remove support for snipmate.
  > Add library path for x86_64 Linux systems.
  > Remove unnecessary assignment
  > Merge branch 'kill-clang'
  > Merge pull request #287 from pcc/resolve-paths
  > Ensure to not expose the last_query cache
  > Merge branch 'issue264'
  > Merge branch 'update-kinds'
  > Merge branch 'issue264'
  > Merge branch 'add_builtin_directories' of git://github.com/tobig/clang_complete into builtin-dirs
  > Document the behaviour of getCompilationDBParams when a file is not found in the compilation database
  > Remember the last compilationDatabase query, and return it when the file is not found
  > Fix initialisation of the compilation database.
  > Fix indent.
  > Use the 'with' syntax with the libclangLock.
  > Replace call to vim.eval/command to vim python API.
  > Merge branch 'deprecate-non-libclang'
  > Fix header regexp.
  > Merge: [cindex.py]: Use spaces instead of tabs
  > Merge: [cindex.py] Add cache for CompletionChunk spellings
  > Merge: [cindex.py] Replace CachedProperty with our own implementation
  > Merge: [cindex.py]: Speed up lookup of the completion kind
  > Merge: [python bindings] Expose cursor.referenced (clang_getCursorReferenced).
  > Merge: Fix a copypasto bug. Also rename the parameter in question to not shadow the 'file' builtin, and fix up a docstring a little.
  > Merge branch 'perf'
  > Calling python print in a thread can segv vim.
  > Do not filter before going through all the chunks of a result.
  > Speed up alpha sorting: from 0.070 to 0.027.
  > We shouldn't use vim API inside clang_complete threads.
  > Warn if snippet conceal is requested but not available.
  > Automatically use libclang if available
  > libclang: Rework handling of builtin includes
  > Catch Exception when loading libclang fails
  > Make it clear that we disable libclang if the initialization fails
  > Always initialize g:clang_library_path
  > Do not provide the clang/gcc autoloader any more
  > Use the clang driver instead of 'clang -cc1'
  > Fix merge error
  > Merge branch 'print_command_line' of git://github.com/tobig/clang_complete into tobig
  > Merge branch 'cdb_v5' of git://github.com/Arnaud-de-Grandmaison/clang_complete into cdb
  > Revert "Don't allow duplicate entry in the completion popup."
  > Merge pull request #213 from tobig/update_cindexpy

* .vim/bundle/colors-badwolf 41ece91...627b465 (3):
  > More interesting words.
  > Add some Lispyscript-specific coloring.
  > Add g:badwolf_tabline setting.

* .vim/bundle/colors-railscasts b79b413...9035daf (2):
  > Update README.md
  > Merge pull request #9 from antonr/terminal

* .vim/bundle/commentary dc349bb...a3ae0df (3):
  > Switch official interface from \\ to gc
  > Provide gc alongside \\
  > Fix modeline

* .vim/bundle/ctrl-p 7251d9d...287b9c1 (22):
  > Include [No Name] buffers
  > Apply mruf_relative to the raw list
  > Non-subdir completion for in-prompt cd
  > Revert "Move the completion function"
  > Specify the license
  > Ignore ignored cwd
  > Call s:Close() directly
  > Update readme.md
  > Simplify the filtering
  > Version 1.79
  > The message can be useful
  > Run :tag as if typed
  > Reset 'cscopetag' temporarily while using `:tag`
  > Check bufnr and bufname before closing
  > Fix for recognizing/expanding of environment variables
  > Set pos when data is empty
  > Update ctrlp.txt
  > Check and insert the ending slash
  > Further reduce MRU saving
  > Allow x_func options to be defined using dict functions
  > Add an option for saving the MRU list on every update
  > Make ctrlp#call return the result

* .vim/bundle/easymotion 667a668...4fb1af8 (3):
  > Update jumplist when moving cursor
  > Merge branch 'master' into develop
  > Merge branch 'release/1.3' into develop

* .vim/bundle/fugitive 3f703b6...54ead5a (30):
  > Update :Gblame explanation in README
  > Extract contribution guidelines
  > Change heading style
  > Press - on first line of :Gstatus to edit .git
  > Encapsulate restore options for diff
  > Revert "Add foldenable to fugitive_diff_restore"
  > Add foldenable to fugitive_diff_restore
  > Loosen regex to compensate for iskeyword
  > Don't dispatch autocommands when calling git commit
  > Add . to prepopulate command line with revision
  > Change cp to cP
  > Include tree filename in <C-R><C-G>
  > Seek to blob name in tree with -
  > Expose detect interface
  > Add foldlevel to fugitive_diff_restore
  > Work around archaic encodings
  > Unify escaping rules for :Gedit with :edit
  > Fix :Git! on Windows.
  > Switch :Gblame <CR> to open commit
  > Fix setting of foldmethod in :Gstatus
  > Don't clobber foldmethod in :Gedit :
  > Support WIDE COLON in :Gstatus in some locales
  > Fix supposed "Press ENTER" prompt
  > Revert "s:Detect: only add readable files to &tags and doc"
  > Fix duplicate Signed-off-by lines
  > Return '' from buffer.path() if outside work tree
  > Send :help :Gw to the right place
  > Fix error when g:fugitive_github_domains is unset
  > Allow :Gbrowse on HTTP GitHub FI
  > Escape # in :Glog

* .vim/bundle/gitv 582e32b...0b797d1 (6):
  > Merge pull request #58 from lgauthie/master
  > Merge pull request #55 from pydave/fix-submodules
  > Merge pull request #54 from pydave/patch-1
  > Merge pull request #51 from aschrab/jump_to_commit
  > Merge pull request #50 from aschrab/fold_markers
  > Merge pull request #47 from juhasz/master

* .vim/bundle/nerdtree 22de74a...448ad6f (22):
  > Merge pull request #255 from joshuarh/unique-mappings
  > move the class files out of the plugin dir
  > fix a bug where the user couldnt override the mapping for <cr>
  > fix NERDTreeCWD
  > catch an error thrown when refreshing a dir with a FIFO or socket
  > move a couple of functions into NERDTreeCreator
  > add some class methods to wrap the NERDTreeCreator public methods
  > Merge pull request #227 from kasyaar/copy_node_fix
  > extract the tree creation functions out into their own class
  > fix a couple of function calls that should have been renamed
  > some cosmetic updates to the class files
  > fix the <enter> mapping
  > move KeyMap_Invoke into the autoload file
  > manually apply #220 to fix NERDTreeFind for hidden dirs
  > replace a script level var with a query
  > decompose the giant NERD_tree.vim file
  > Merge pull request #219 from felipebueno/master
  > Merge pull request #213 from cperl82/fixes
  > Merge pull request #204 from techlivezheng/feature/chrootcwd
  > Merge pull request #203 from techlivezheng/feature/find-in-existing-window
  > add Path.isUnixHiddenFile and refactor to use it
  > Merge pull request #202 from techlivezheng/feature/find-hidden-file

* .vim/bundle/nerdtree-tabs 1e745da...84ccf91 (23):
  > v1.4.4
  > Minor tweaks to startup focus
  > Merge pull request #43 from rr-/master
  > Changelog for v1.4.3
  > Merge pull request #41 from szajbus/master
  > Merge branch 'feature/add-augroup' of git://github.com/techlivezheng/vim-plugin-nerdtree-tabs
  > Small improvement
  > Add fold marker
  > [4/4] Rearrange code
  > [3/4] Rearrange code
  > [2/4] Rearrange code
  > [1/4] Rearrange code
  > [4/4] Rename function
  > [3/4] Rename function
  > [2/4] Rename function
  > [1/4] Rename function
  > Format code, indentation and blank lines
  > Changelog for v1.4.2
  > Add diff mode startup setting to readme
  > Do not open NERDTree if vim starts in diff mode
  > Switch back to the previous window instead of the next window
  > Fix a mistake introduced in last commit
  > Unfocus NERDTree window to next normal window

* .vim/bundle/powerline 2af0748...09c0cea (4):
  > Use stricter matches. Also don’t count on 'ignorecase' option when matching buffers
  > Setup statusline for all windows opened when vim starts
  > Add support for command windows (q:, q/)
  > Add deprecation warning

* .vim/bundle/repeat 613eb1c...a81bef7 (5):
  > repeat.vim 1.1
  > Allow customizing all mappings
  > Documentation fix for repeat#setreg()
  > Go back to using feedkeys()
  > Allow for some additional post-processing

* .vim/bundle/surround 1a73f60...02199ea (8):
  > Support to disable mappings only for insert mode
  > Default to automatic indenting
  > surround.vim 2.0
  > Add a lisp function call replacement
  > Add : replacement
  > Add leading space replacement
  > Remove documentation of LaTeX expansion
  > Fix deletion of delimiters on their own lines

* .vim/bundle/tabular 7f6f172...0c856ba (4):
  > More detailed installation instructions in README
  > Add pathogen link from README.md
  > Add some links to README.md
  > Merge pull request #16 from evanswebdesign/master

* .vim/bundle/tagbar 568ef5f...24915db (45):
  > Handle non-existent project autocmds properly, closes #145
  > Expand deffile path
  > Try to distinguish between equal alternative tags, closes #139
  > Convert remaining call to CreateTypeKinddict(), closes #142
  > Move tests into separate repository
  > Re-enable BufReadPost event
  > Merge branch 'inkarkat-enh-syntax'
  > Make createKinddict() an instance method
  > Allow project-specific type config
  > Merge pull request #135 from darcyparker/issue133_ctagsbin
  > Add tests to repository
  > Simplify getusertypes() function
  > Recognize racket as scheme, closes #134
  > Version 2.5
  > Return to the correct window after closing Tagbar, closes #132
  > Don't disrupt the statusline if ctags fails
  > Explain ctags bug issues in README.md
  > Rename README to README.md
  > Don't restore window position if moved manually
  > Save and restore window position when expanding, closes #129
  > Run ctags even if previous run produced erros, closes #125
  > Better handling of switching to unsupported buffer
  > Update credits
  > Merge pull request #123 from jszakmeister/fix-currenttag-on-unsupported-file
  > Prevent update error when current file is empty
  > Fix header indentation
  > Merge pull request #118 from techlivezheng/feature/autoupdate-on-bufreadpost
  > Don't update when in previewwindow, closes #112
  > Add abort() to NextNormalWindow function
  > Small patch cleanup
  > Only reset '0 mark when it is the last window
  > Only colse the tagbar window itself
  > Quit if no more normal window exists
  > Reinstate noautocmd when going to pprev window
  > Small cleanup of last patch
  > Do not interfere window switching history
  > Improve out-of-sync error reporting
  > Always colour signature correctly
  > Make visibility symbols optional
  > Use 'visibility' instead of 'access' everywhere exclusively
  > Update credits
  > Small doc fix
  > Updates to TagbarTogglePause
  > Merge branch 'master' of github.com:kianryan/tagbar
  > Pause autocmd functionality with :TagbarPause

* .vim/bundle/ultisnips 629ff84...015c78c (48):
  > ipdb snippet.
  > Puppet style fixes by JHaals
  > Improvements to the tex snippets by rene vergara.
  > Completion for UltiSnipsEdit. Patch by Zhao Cai.
  > Fixes to eruby snippets by jinzhu.
  > if, ife and ifee snippets for python by Josh Strater.
  > Small fixes and new c-sharp (cs) snippets by Matthew Strawbridge.
  > Fix for bug 1073816 and some improvements to debug utilities.
  > Enhancements to shell code intepolation: Try hard to find a directory where we actually can execute something. Patch by Keith Welch.
  > Fixes to puppet snippets by javipolo.
  > Fixed * -> |.
  > Added a section about other plugins UltiSnips plays well with and linked to Stanislav's work.
  > OCaml snippets by Rudi Grinberg.
  > Remove const qualifier from main in c.snippets
  > Remove a stray '2' from the python snippets. Patch by Stanislav.
  > Improvements to Javascript snippets by Vangelis Tsoumenis
  > Improvements to xml snippets by jhradilek
  > Improvements to the syntax file.
  > Fix problems with replaying tab keys in macros. US now needs a very recent version of supertab or no supertab at all.
  > Fixes to the box and bbox snippet.
  > C snippet improvements by melko.
  > Improvements to the box snippet by Sergey Alexandrov
  > Improvements to c.snippets by melko.
  > Easy access to UltiSnips python modules. Patch by Stanislav Golovanov.
  > Use normal!
  > New xml snippets. Updated html and major update to java snippets by Tom Cammann.
  > Correct commentstring for snippet files by Mike Morearty
  > Improvements to JS snippets by tom cammann
  > Improvements to the js snippets by Harry Xu.
  > Improvements to c and cpp snippets by David Brown.
  > Merged doc updates by Matt Patterson and added him to the list of contributors.
  > Added b4winckler to the list of contributors.
  > Remove stray space in LaTeX section snippet
  > Fixed a problem with supertab, sparkup and ultisnips. Patch by Eric Van Dewoestine.
  > updated github url in doc.
  > Perl improvements by Steven Humphrey
  > Merge pull request #41 from s0undt3ch/features/single-quotes
  > Added Pedro to the list of contributors.
  > Merge pull request #42 from s0undt3ch/hotfix/pep-8
  > Improvements to D snippets by Ferdinand Majerech
  > New snippet option to strip whitespaces in front of cursor. Patch by aschrab
  > Merge remote-tracking branch 'aschrab/trailing' into trailing
  > Fixed pythons rwprop snippet.
  > Fixes and improvements to snipmate conversion util by Steve McKinney
  > Syntaxhighlighting for clearsnippets by Aaron Schrab
  > Merge remote-tracking branch 'osse/master'
  > Improvements to C snippets by Vivien Didelot
  > Bug fixes for D snippets.

* .vim/bundle/unbundle d2fca12...c3940ed (5):
  > GH-8: ftbundles needed at startup weren't loaded
  > :Unbundle had no effect if Vim finished starting
  > Merge branch 'kaoriya'
  > port information from in-Vim help into README
  > add in-Vim help documentation for this Vim script

* .vim/bundle/unimpaired 9507b80...cabf4b7 (19):
  > Wrap the 'paste' dance
  > Work around weird conceal rendering quirk
  > Handle embedded newlines in C strings correctly
  > Add option togglers
  > unimpaired.vim 1.2
  > Remove Base64 encoding from documentation
  > Formally deprecate [o and ]o
  > Remove base64 encoding
  > Fix repeat of line encoding
  > Expose API for custom encoding algorithms
  > Change `*prfile` to `*pfile`
  > Add maps for :[lc][np]file
  > Remove junk
  > Change [o and ]o to [f and ]f
  > Support weirdos who remap tab
  > Don't use backticks
  > Filter &suffixes in s:entries().
  > Underlined Markdown headings are dumb
  > Clarify repeatability

* .vim/bundle/vimproc 2f9eaa7...9d84e5a (51):
  > - Improved documentation.
  > - Fixed vimproc#delete_trash().
  > - Fixed for warning.
  > - Added starting GUI command support in Windows.
  > - Improved vimproc#delete_trash().
  > - Improved vimproc#readdir().
  > Merge pull request #50 from ichizok/improved-make_mac
  > Merge pull request #49 from ichizok/improved-make_mac
  > Merge pull request #48 from ichizok/organized-for-sunos
  > Merge pull request #47 from crazymaster/master
  > - Fixed vimproc#system_passwd().
  > - Fixed vimproc#system_passwd().
  > Merge pull request #46 from AmaiSaeta/refactoring/submodulize-winsock-initializer-terminator
  > Merge pull request #45 from AmaiSaeta/fix/vp_host_exists-missing-init-4-winsock
  > - Improved tests.
  > - Improved catch behavior.
  > - Fixed for double quote.
  > - Fixed escape sequence behavior.
  > - Added Android support.
  > Merge pull request #43 from rusuki/add_android_support
  > - Improved glob().
  > - Fixed backquote.
  > - Fixed expand glob.
  > - Changed expand wildcard behavior.
  > - Fixed error message.
  > - Fixed parse variables.
  > - Improved a bit.
  > - Improved a bit.
  > - Improved initialization.
  > - Changed timeout behavior.
  > - Deleted debug message.
  > - Fixed parser.
  > Merge branch 'master' of github.com:Shougo/vimproc
  > - Fixed parser.
  > Merge branch 'master' of github.com:Shougo/vimproc
  > - Fixed parse of backquote.
  > - Improved a bit.
  > - Improved vimproc#kill() behavior.
  > - Improved Mac checker.
  > - Improved mac checker.
  > - Improved documentation.
  > - Improved documentation.
  > - Improved for Visual Studio support(KoRoN).
  > Merge pull request #37 from koron/improve_msvc_support
  > - Converted markers.
  > - Fixed for UTF-8 string(mattn).
  > - Improved documentaion.
  > - Improved vimproc#get_last_errmsg().
  > - Deleted changelog.
  > - Test update.
  > - Added for neobundle description.

* .vim/bundle/vimux d6d88a4...35c54c0 (5):
  > Merge pull request #64 from jingweno/master
  > Merge pull request #62 from fishman/allow_backticks
  > Merge pull request #59 from chip/master
  > Add vimux-golang to README
  > Merge pull request #56 from tonyskn/betterCloseRunnerPane

* .vim/ftbundle/haskell/ghcmod-vim 005fd8e...b4d702a (56):
  > Version 1.0.0
  > Fix test case for ghcmod#build_command()
  > Revert caa8d0bd18f8f1fd8ebd1d6e8be2258be3cc2f2b (#27)
  > Change ghcmod#expand() to include splicing end locations
  > Add test cases for :GhcModCheck
  > Rewrite tests to use tinytest framework
  > Fix :GhcModCheckAndLintAsync (#26)
  > Tweak warning/error message
  > Show Travis-CI status
  > Tweak README.md
  > Remove .gitattributes
  > Add test cases for :GhcModType and :GhcModTypeClear
  > Remove user's runtimepath
  > Output messages to a log file for inspection
  > Ignore warning messages in testing
  > Improve test output
  > Test b:ghcmod_ghc_options priority
  > Add test cases for ghcmod#make('lint') and ghcmod#async_make('lint')
  > Add test cases for ghcmod#make('check') and ghcmod#async_make('check')
  > Remove "Dummy:0:0:" prefix
  > Convert location values to integer
  > Add a test case for ghcmod#info()
  > Expand path to full path before adding it to &rtp
  > Respect g:ghcmod_ghc_options
  > Add test cases for ghcmod#build_command()
  > Add test cases for ghcmod#basedir()
  > Create clean test/output directory before testing
  > Add test cases for ghcmod#detect_module()
  > Cosmetic changes
  > Add more [!] variants for consistency
  > For consistency: ghcmod#command#preview() -> ghcmod#command#info_preview()
  > s:buffer_path()
  > Don't escape the output from ghcmod#info()
  > Move ghcmod#preview() to ghcmod/command.vim
  > Move ghcmod#check_version() to ghcmod/util.vim for faster boot
  > Split ghcmod#expand()
  > Split ghcmod#async_make() and improve callback mechanism
  > Split ghcmod#make()
  > Split ghcmod#info()
  > ghcmod#wait() -> ghcmod#util#wait()
  > Refactor :GhcModType stuff
  > Move utility functions to autoload/ghcmod/util.vim
  > Upload to vim.org
  > Version 0.4.0
  > Quit guessing the type if the current buffer is modified (#24)
  > Fix lnum and col for Vim to recognize it as an error
  > Restore the original meaning of g:ghcmod_use_basedir (#25)
  > Merge pull request #25 from drchaos/use_basedir
  > Merge remote-tracking branch 'origin/fix-detect_module'
  > ghcmod#info(): Remove trailing newlines (#24)
  > Suppress empty line when ghcmod#type() fails (#24)
  > Version 0.3.0
  > Revert "Add the '-fno-code' flag by default."
  > Add notice about ftplugin
  > Add buffer-local version of g:ghcmod_ghc_options
  > Merge pull request #21 from marcmo/robust_parse

* .vim/ftbundle/haskell/neco-ghc 0ad65c7...6b86f4e (3):
  > Add g:necoghc_enable_detailed_browse option
  > Expose ghc package
  > Invoke completion even if a:base is empty (#8)

* .zsh/oh-my-zsh c2ae9e0...b34aee7 (185):
  > Merge pull request #1774 from kevinxucs/sublime-default-2
  > Merge pull request #1779 from lorn/fasd_update
  > Merge pull request #690 from essembeh/master
  > Merge pull request #1254 from systemfreund/master
  > Spin to bundler
  > Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
  > Resolving conflict with merge of #1058
  > Merge pull request #1091 from jmazzi/patch-1
  > Merge pull request #1102 from drnic/git-config
  > Merge pull request #1225 from bobmaerten/patch-1
  > Merge pull request #711 from jasongill/textmate-plugin-improvement
  > Merge pull request #424 from hackedy/fix
  > Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
  > Resolving conflict when merging in #528
  > Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
  > Updating the README file
  > Merge pull request #1569 from ZeroKnight/master
  > Resolving conflict with merge of #970
  > Merge pull request #1223 from bigjust/master
  > Merge pull request #1620 from hreese/gpg-agent_with_sensible_ssh-agent
  > Merge pull request #1490 from khrt/master
  > Merge pull request #1565 from serdardalgic/autoenv-plugin
  > Resolving conflict in #1266 merge
  > Resolving conflict when merging in 1570
  > Merge pull request #1575 from mguindin/agnoster-change
  > Merge pull request #1582 from To1ne/pushdminus
  > Merge pull request #1608 from swanandp/m_lion_terminal_same_tab_support
  > Merge pull request #1622 from hacfi/patch-1
  > Merge pull request #1634 from Anahkiasen/patch-1
  > Merge pull request #1641 from NeuralSandwich/master
  > Merge pull request #1702 from mbauhardt/copyfile
  > Merge pull request #1715 from dbohdan/master
  > Merge pull request #1724 from miry/rails_aliases
  > Merge pull request #1703 from marcparadise/mp/knife-chef-11-initial-support
  > Merge pull request #1704 from laggyluke/st3
  > Merge pull request #1718 from toctan/master
  > Merge pull request #1721 from z2v/hgplugin
  > Merge pull request #1707 from bkg/django-static
  > Merge pull request #1714 from f0y/07738ea86330b7b77127fc6f18474b3da2c6ecec
  > Merge pull request #1719 from MatthR3D/master
  > Merge pull request #1726 from rkj/master
  > Merge pull request #1728 from szines/patch-1
  > Merge pull request #1729 from statschner/master
  > Merge pull request #1739 from felipec/fc/gitfast
  > Merge pull request #1749 from johnjohndoe/feature/zeus-auto-completion
  > Merge pull request #1733 from jaseg/patch-1
  > Merge pull request #1734 from cborgia/master
  > Merge pull request #1737 from hron84/feature-bundler-add-cleanup
  > Merge pull request #1738 from ronshapiro/master
  > Merge pull request #1748 from tobiassjosten/patch-1
  > Merge pull request #1740 from felipec/fc/git
  > Merge pull request #1750 from JamesFerguson/master
  > Merge pull request #1745 from jtheoof/master
  > Merge pull request #1747 from dhemmerling/mvn_tomcat-redeploy
  > Merge pull request #1526 from filipechagas/master
  > Merge pull request #1531 from lcosmin/master
  > Merge pull request #1532 from ryanneufeld/torrent_tools
  > Merge pull request #1537 from everbird/master
  > Merge pull request #1540 from goofansu/add-rebar-plugin
  > Merge pull request #1651 from deepusudhakar/master
  > Merge pull request #1696 from henryyan/master
  > Merge pull request #1700 from Bercio/master
  > Merge pull request #1701 from mbauhardt/copydir
  > Merge pull request #1706 from keyvez/master
  > Merge pull request #1711 from bertabus/master
  > Merge pull request #1699 from Bercio/patch-1
  > Merge pull request #1689 from afh/pull/emoji_clock
  > Merge pull request #1208 from jaischeema/master
  > Merge pull request #1060 from danielbayerlein/new-theme-inspired-by-peepcode
  > Merge pull request #729 from doitian/plugin_tmuxinator
  > 005d967dc4e879f304607a706ccd18886e630dc1
  > Merge pull request #1632 from jmatth/tmux_plugin
  > Merge pull request #1652 from z2v/master
  > Merge pull request #1654 from bertag/parse-git-dirty-support-for-1.6
  > Merge pull request #1655 from nubs/phing-and-cache-files
  > Merge pull request #1656 from hacfi/patch-2
  > Merge pull request #1665 from bmcorser/patch-1
  > Merge pull request #1679 from KokaKiwi/master
  > Merge pull request #1680 from zbrox/master
  > Merge pull request #1681 from akre54/add-bower
  > Merge pull request #1685 from justinclayton/patch-1
  > Merge pull request #1686 from timsly/hub-autocomplete
  > Merge pull request #1690 from docwhat/git-untracked
  > Merge pull request #1662 from rylwin/patch-1
  > Merge pull request #1674 from simeonwillbanks/master
  > Merge pull request #1678 from lesmyrmidons/symfony2
  > Merge pull request #1682 from maplebed/ben.knife
  > Merge pull request #1691 from gianu/master
  > Merge pull request #1697 from dsx/sublime-plugin-fix
  > Merge pull request #1698 from ConradIrwin/safe-paste
  > Merge pull request #749 from blueyed/setopt-correct
  > Merge pull request #1657 from ysmood/master
  > Merge pull request #1658 from kavu/patch-1
  > Merge pull request #1659 from AshleyS/master
  > Merge pull request #1661 from hellerbarde/master
  > Merge pull request #1558 from sbooob/master
  > Merge pull request #1573 from flz/master
  > Merge pull request #1595 from nevir/sublime3-support
  > Merge pull request #1598 from zasdfgbnm/master
  > Merge pull request #1607 from gekken/master
  > Merge pull request #1610 from mcaserta/scala_and_sbt_plugins
  > Merge pull request #1611 from ripdog/patch-1
  > Merge pull request #1614 from miklos-martin/bower
  > Merge pull request #1616 from sxeraverx/master
  > Merge pull request #1524 from bonifaido/master
  > Merge pull request #1638 from RomainBelorgey/master
  > Merge pull request #1650 from ishtu/master
  > Merge pull request #1663 from flavius/master
  > Merge pull request #1664 from marcel-wolf/master
  > Merge pull request #1668 from sheerun/patch-1
  > Merge pull request #1669 from desimone/master
  > Merge pull request #1671 from lifinsky/master
  > Merge pull request #1645 from mbologna/master
  > Merge pull request #1594 from jbhannah/rbenv-gems-fix
  > Merge pull request #1583 from To1ne/pj.plugin
  > Merge pull request #1586 from HeroicEric/master
  > Adding MIT-LICENSE Closes #655
  > Merge pull request #1534 from gberenfield/master
  > Merge pull request #941 from dcreager/configurable-blinks-theme
  > Merge pull request #1077 from Mezzle/add-option-to-show-git-status
  > Merge pull request #1054 from ptillemans/master
  > Merge pull request #1164 from fuksito/master
  > Merge pull request #837 from stacksmashing/master
  > Merge pull request #1510 from agnoster/agnoster-classic
  > Merge pull request #1517 from thisiskun/master
  > Fixes #1489
  > Merge pull request #1473 from bsteuber/fix-git-flow-feature-completion
  > Merge pull request #1475 from westonplatter/master
  > Merge pull request #1477 from madsgraphics/git_prompt_showstashstate
  > Merge pull request #1084 from avit/bwana-plugin
  > Merge pull request #1133 from mappleconfusers/605ad8725b06cc15f8523404f59060b6a71bb7a2
  > Merge pull request #1139 from mappleconfusers/pull_req_git
  > Merge pull request #1233 from mugenken/knife-check-cwd
  > Merge pull request #1467 from timothyandrew/patch-1
  > Merge pull request #1468 from larrylv/unset-config-file-variable
  > Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
  > Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
  > Resolving conflict in merge of #1313
  > hg_current_branch added to mercurial plugin
  > Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
  > Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
  > Fixing conflict in install scripts
  > Merge pull request #1191 from r-darwish/themes-plugin
  > Merge pull request #1235 from henryyan/master
  > Merge pull request #1241 from agrimaldi/git-extras
  > Merge pull request #1249 from korjavin/aptitude
  > Merge pull request #1255 from SuprDewd/master
  > Merge pull request #1256 from seegno/master
  > Merge pull request #1259 from bwl/sublime-fix
  > Merge pull request #1263 from tedv/headless-git
  > Merge pull request #1265 from aletessier/ssh-completion
  > Merge pull request #1274 from sc68cal/feature/git_decorate_log
  > Merge pull request #1277 from waveface/master
  > Merge pull request #1278 from bitboxer/forklift
  > Merge pull request #1284 from obmarg/feature/debianwhichfix
  > Merge pull request #1317 from thcipriani/junkfood_theme
  > Merge pull request #1319 from skatkov/master
  > Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
  > resolving conflict in termsupport plugin
  > Merge pull request #1341 from markusscherer/master
  > Merge pull request #1354 from F30/master
  > Merge pull request #1353 from a-b/master
  > Merge pull request #1371 from rdrey/master
  > Merge pull request #1376 from javageek/master
  > Merge pull request #1375 from dsx/better-pyclean
  > Merge pull request #1378 from hjhart/master
  > Merge pull request #1453 from simonoff/master
  > Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
  > git find
  > Removing mcd as it conflicts with mtools
  > Renaming cap to capistrano
  > Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
  > Modifying documentation in zshrc template for new config option
  > Merge pull request #1430 from danielsoneg/egd-update_frequency
  > Merge pull request #1437 from Partyschaum/master
  > Merge pull request #1446 from suzaku/patch-1
  > Merge pull request #1426 from caarlos0/master
  > Merge pull request #1391 from logicmd/master
  > Merge pull request #1388 from fuadsaud/agnoster_theme_show_exit_status
  > Merge pull request #1395 from caarlos0/master
  > Merge pull request #1406 from chinghanho/master
  > Merge pull request #1404 from Bklyn/master
  > Merge pull request #1396 from webframp/fix/brew-autojump-zsh
  > Merge pull request #1415 from jmatth/git_root_pull
  > Merge pull request #1417 from felipec/fc-git-upstream

* .zsh/zsh-completions f7c0f03...9cbd2b6 (27):
  > Merge pull request #134 from zhaocai/feature/_gem
  > Merge pull request #133 from zhaocai/brew
  > Merge pull request #128 from pcasaretto/add-remote-argument-to-heroku
  > Merge pull request #132 from mollifier/svm-completion
  > Merge pull request #130 from g5pw/master
  > _id3v2: complete at least one option before filenames
  > _id3: small update in descriptions and logic
  > _id3v2: initial commit
  > _id3: initial commit
  > _dzen2: initial commit
  > Merge pull request #131 from markcornick/knife_user_completion
  > Merge pull request #127 from glidenote/ag-completion
  > Merge pull request #126 from cknadler/master
  > _logger: initial commit
  > Merge pull request #125 from benohara/master
  > _socat: initial commit
  > Merge pull request #124 from brandt/master
  > Merge pull request #123 from mcaserta/master
  > Update _scala for Scala version 2.10.0
  > Merge pull request #120 from amouravski/patch-1
  > Merge pull request #118 from mitukiii/gem
  > Merge pull request #119 from cirilloblu/patch-1
  > Merge pull request #115 from pismute/docpad
  > Merge pull request #117 from pismute/nvm
  > Merge pull request #116 from supki/cabal-completion
  > Add completions for _mussh
  > Merge pull request #114 from Poapfel/master

* .zsh/zsh-syntax-highlighting 4519467...e5d8a50 (2):
  > Merge pull request #106 from cknadler/master
  > Merge pull request #100 from hchbaw/for-nicoulaj/pattern-local