Squashed 'oh-my-zsh/' changes from 61e3951..c79e5a9

c79e5a9 Merge pull request #2132 from jkaving/forklift2
bbe4ea5 Merge pull request #2139 from deiga/patch-1
a8efe61 Merge pull request #2145 from futjikato/master
9afb139 Updated completion to work with comma seperated list
33b1a3b Added gitignore plugin ( for gitignore.io )
671db71 Added '.jar'
387de3a Added '.war' extension to unzip
2be4158 Add support for ForkLift 2 to the ForkLift plugin

git-subtree-dir: oh-my-zsh
git-subtree-split: c79e5a97a906457d1778197bd4f29640d1917201
Merge commit '42ee14980c480030a3c87a14226732e09cf740fb'
migrate from mplayer to mpv.
Squashed 'vimfiles/' changes from 68f30fa..b0079fc

b0079fc Merge commit '9b8c395dbe9499d83e640ba31055cfe676fb13e4'
9b8c395 Squashed 'bundle/syntastic/' changes from 58ba3d4..2fbd870

git-subtree-dir: vimfiles
git-subtree-split: b0079fc6479e5b82f32503cb52ffb156714c8d04
Merge commit '567ac61ac8158e6a688f48327ac0b7dc5508772b'