fix all2mp4 issue to calculate video bitrate properly.
Squashed 'vimfiles/' changes from 08b9d7d..887fcaf

887fcaf Merge commit 'f87ebad371ed225b8e58291a0ea54d2497d763af'
f87ebad Squashed 'bundle/ack.vim/' changes from d5e83b2..303bcef
cd6a4ea Merge commit 'efb073bf2c2efbb8c9818dafaf91ae54dc26a13f'
efb073b Squashed 'bundle/tagbar/' changes from 9bf4fd9..59c9b7c
0dc160b Merge commit '06c5b4e66ce20fad09e29b5ad2d97c72ab35ed71'
06c5b4e Squashed 'bundle/syntastic/' changes from 4004c02..1ee4bcc
e6799f0 Merge commit '190b800623fbc86d4f5c8e6dd43250e50ca418d6'
190b800 Squashed 'bundle/neocomplcache/' changes from 50358bb..627d5d6
1b5fa47 django&jquery use modeline instead.

git-subtree-dir: vimfiles
git-subtree-split: 887fcaf11d65b0e5ccb90bee705104707ade2ded
Merge commit 'deca37d8662e6bf08d6eb5688398f0bcf7845259'
Squashed 'oh-my-zsh/' changes from 3913106..4131a59

4131a59 Merge pull request #2827 from ncanceill/easymerge
08632bb Basic support for Docker related commands.
ce9ec85 Add Composer's global binaries to PATH
dbca185 Add /usr/bin/subl path for who has linked sublime text there
75c02dd Plugin jump: autocompletion for numbers and dots
bc2e3ff added useful mvn aliases
f2b81e2 Add spring to bundled commands
c5d9fc9 git_prompt_info: ignore git-config errors
49161e7 Add missing `command` wrapper for git
340da08 Add missing quotes to within-bundler-project function
82d557a Add pip2 and pip-2.7 support to pip plugin
89a5075 Add pip3 completion support to pip plugin
09fdf76 ignore usernames beginning with underscore
7fbbf28 return 0 when not a git repo before, 128 was returned, which could display an error, but out of a git repo this should exit silently fixes #2226
999bd35 fix root mode not working in bureau
50fe95a Autojump plugin: check user local installation first.
519d37f Vundle plugin now works with submodules.
aee8877 fixed rvm warning
99c9dbe New alias for repo: ru and rst
e04d3e0 Add startproject to django command completions
f7948ac Adding compression to rsync commands
f82092a Add a command to show unresolve files in merge
67d74cb Don't override ZSH_COMPDUMP if already set.
fbf4a78 Show user prompt in gnzh theme regardless of UID
a9e1d9a Cancel upgrade if $ZSH is not writable from #2360
de41dee Add alias for container:debug task
e5ed07e specify python2 in shebang as suggested in #2382
7297b44 too many plugins = slow init warning
3cdfdad use ls instead of find to avoid incompatibility with gnu find
b1c97bc Fix comparison used to determine if the cache is outdated.
ac1a321 add gfa alias for recursive formatting inspired from #2018
76e23e6 Fix permissions on wd plugin continuating #1923
b569273 Removed unnecessary execute permissions for some plugins
3c41da3 Update colorize.plugin.zsh
3fac127 Correct wrong plugin file name
97ab436 Fix path for colemak plugin
6bf7f39 Steeef theme checks untracked files instead of directories
80828cd Update plugins/rbenv/rbenv.plugin.zsh
7bb42fb Corrected syntax error in github plugin's empty_gh function
6fc241b extract plugin will unzip *.sublime-package files
1ad1c52 Move aliases to 'custom' section of .zshrc template
c0b094c Fix function/alias naming clash between bower and bundle plugin
b64e695 Ordering nocorrect aliases alphabetically
cd8d5c4 Defining nocorrect aliases only when ENABLE_CORRECTION is "true"
4c64cf4 Replacing DISABLE_CORRECTION with ENABLE_CORRECTION in zshrc template
8d976e0 fix(tools/check_for_upgrade): Don't source profile
5e601d6 Fix dud alias. Switch --max-depth for just -d
c1f5a17 This is already done in lib/theme-and-appearance.zsh and supports Darwin/BSD/etc
9590b96 Write the update file even if `CLOBBER` is unset.
8355233 Fixing typo.
0b4bf90 Minor markup edits
2c19c0e typo, fixes #1806

git-subtree-dir: oh-my-zsh
git-subtree-split: 4131a59d1a57d53bf711115317116a6c57483636
Merge commit '3471867452f74db775c8453fff093afb9888b0b5'