Merge Linux and Win32 vimrc files. Add gitgutter.