Don't use jellybeans for non gvim on windows
Merge remote-tracking branch 'origin/master' into laptop