UPdates bundle command to use binstubs
Adds vim mergetool

works pretty well...
Using vim colourscheme in gvim
Sets gvim columns to 100 by default
Improves tab behaviour
Sets noesckeys
Removes unused maps