Minor changes

* vimdiff for diffing in git
* No menu, toolbar or scrollbars in gvim
* Separate tabstop from other tab settings in vim
* Enable italics in gvim even if turned off in terminal