Add support for ForkLift 2 to the ForkLift plugin

The ForkLift plugin now supports ForkLift 2 as well as ForkLift 1.
If ForkLift is not running it also waits for it to be running before
trying to switch to the specified directory
Added '.war' extension to unzip
Added '.jar'
Added gitignore plugin ( for gitignore.io )
Updated completion to work with comma seperated list
Merge pull request #2145 from futjikato/master

Added gitignore.io custom plugin
Merge pull request #2139 from deiga/patch-1

Added '.war' extension to unzip
Merge pull request #2132 from jkaving/forklift2

Add support for ForkLift 2 to the ForkLift plugin
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

# By Timo Sand (2) and others
# Via Robby Russell (3) and futjikato (1)
* 'master' of https://github.com/robbyrussell/oh-my-zsh:
  Updated completion to work with comma seperated list
  Added gitignore plugin ( for gitignore.io )
  Added '.jar'
  Added '.war' extension to unzip
  Add support for ForkLift 2 to the ForkLift plugin