Some minor diffs + added settings for gVim and some plugins