diff --git a/.gitconfig_includes.cygwin b/.gitconfig_includes.cygwin
index 2b5136c3..d86e50cf 100644
--- a/.gitconfig_includes.cygwin
+++ b/.gitconfig_includes.cygwin
@@ -10,7 +10,7 @@
     trustExitCode = false
     keepBackup = false
 [merge]
-    tool = vimdiff
+    tool = kdiff3
 
 [core]
 	autocrlf = false
diff --git a/.kdiff3rc b/.kdiff3rc
index 765aaa88..f42b40c5 100644
--- a/.kdiff3rc
+++ b/.kdiff3rc
@@ -1,93 +1,93 @@
-AutoAdvance=0
-AutoAdvanceDelay=500
-AutoCopySelection=0
-AutoDetectUnicodeA=1
-AutoDetectUnicodeB=1
-AutoDetectUnicodeC=1
-AutoIndentation=1
-AutoMergeRegExp=.*\\$(Version\|Header\|Date\|Author).*\\$.*
-AutoSaveAndQuitOnMergeWithoutConflicts=0
-AutoSelectOutEncoding=1
-BgColor=255,255,255
-BinaryComparison=0
-CaseSensitiveFilenameComparison=1
-ColorA=0,0,200
-ColorB=0,150,0
-ColorC=150,0,150
-ColorForConflict=255,0,0
-CopyNewer=0
-CreateBakFiles=1
-CurrentRangeBgColor=220,220,100
-CurrentRangeDiffBgColor=255,255,150
-Diff3AlignBC=0
-DiffBgColor=224,224,224
-DirAntiPattern=CVS;.deps;.svn;.hg;.git
-EncodingForA=System
-EncodingForB=System
-EncodingForC=System
-EncodingForOutput=System
-EncodingForPP=System
-EscapeKeyQuits=0
-FgColor=0,0,0
-FileAntiPattern=*.orig;*.o;*.obj;*.rej;*.bak
-FilePattern=*
-FindHidden=1
-FollowDirLinks=0
-FollowFileLinks=0
-Font=Courier,10,normal
-FullAnalysis=1
-Geometry=960,454
-HistoryEntryStartRegExp=\\s*\\\\main\\\\(\\S+)\\s+([0-9]+) (Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec) ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\\s+(.*)
-HistoryEntryStartSortKeyOrder=4,3,2,5,1,6
-HistoryMergeSorting=0
-HistoryStartRegExp=.*\\$Log.*\\$.*
-HorizDiffWindowSplitting=1
-IgnorableCmdLineOptions=-u;-query;-html;-abort
-IgnoreCase=0
-IgnoreComments=0
-IgnoreNumbers=0
-IrrelevantMergeCmd=
-ItalicForDeltas=0
-Language=Auto
-LineEndStyle=2
-LineMatchingPreProcessorCmd=
-ManualAlignmentRangeColor=255,208,128
-MaxNofHistoryEntries=-1
-MidAgeFileColor=192,192,0
-MissingFileColor=0,0,0
-NewestFileColor=0,208,0
-OldestFileColor=240,0,0
-Position=0,22
-PreProcessorCmd=
-RecentAFiles=
-RecentBFiles=
-RecentCFiles=
-RecentEncodings=
-RecentOutputFiles=
-RecursiveDirs=1
-ReplaceTabs=0
-RightToLeftLanguage=0
-RunHistoryAutoMergeOnMergeStart=0
-RunRegExpAutoMergeOnMergeStart=0
-SameEncoding=1
-Show Statusbar=1
-Show Toolbar=1
-ShowIdenticalFiles=0
-ShowInfoDialogs=1
-ShowLineNumbers=1
-ShowWhiteSpace=1
-ShowWhiteSpaceCharacters=1
-SkipDirStatus=0
-SyncMode=0
-TabSize=8
-TrustDate=0
-TrustDateFallbackToBinary=0
-TrustSize=0
-TryHard=1
-UnfoldSubdirs=0
-UseCvsIgnore=0
-WhiteSpace2FileMergeDefault=0
-WhiteSpace3FileMergeDefault=0
-WhiteSpaceEqual=1
-WindowStateMaximised=1
-WordWrap=0
+AutoAdvance=0
+AutoAdvanceDelay=500
+AutoCopySelection=0
+AutoDetectUnicodeA=1
+AutoDetectUnicodeB=1
+AutoDetectUnicodeC=1
+AutoIndentation=1
+AutoMergeRegExp=.*\\$(Version\|Header\|Date\|Author).*\\$.*
+AutoSaveAndQuitOnMergeWithoutConflicts=0
+AutoSelectOutEncoding=1
+BgColor=255,255,255
+BinaryComparison=0
+CaseSensitiveFilenameComparison=1
+ColorA=0,0,200
+ColorB=0,150,0
+ColorC=150,0,150
+ColorForConflict=255,0,0
+CopyNewer=0
+CreateBakFiles=1
+CurrentRangeBgColor=220,220,100
+CurrentRangeDiffBgColor=255,255,150
+Diff3AlignBC=0
+DiffBgColor=224,224,224
+DirAntiPattern=CVS;.deps;.svn;.hg;.git
+EncodingForA=System
+EncodingForB=System
+EncodingForC=System
+EncodingForOutput=System
+EncodingForPP=System
+EscapeKeyQuits=0
+FgColor=0,0,0
+FileAntiPattern=*.orig;*.o;*.obj;*.rej;*.bak
+FilePattern=*
+FindHidden=1
+FollowDirLinks=0
+FollowFileLinks=0
+Font=Courier,10,normal
+FullAnalysis=1
+Geometry=960,454
+HistoryEntryStartRegExp=\\s*\\\\main\\\\(\\S+)\\s+([0-9]+) (Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec) ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\\s+(.*)
+HistoryEntryStartSortKeyOrder=4,3,2,5,1,6
+HistoryMergeSorting=0
+HistoryStartRegExp=.*\\$Log.*\\$.*
+HorizDiffWindowSplitting=1
+IgnorableCmdLineOptions=-u;-query;-html;-abort
+IgnoreCase=0
+IgnoreComments=0
+IgnoreNumbers=0
+IrrelevantMergeCmd=
+ItalicForDeltas=0
+Language=Auto
+LineEndStyle=2
+LineMatchingPreProcessorCmd=
+ManualAlignmentRangeColor=255,208,128
+MaxNofHistoryEntries=-1
+MidAgeFileColor=192,192,0
+MissingFileColor=0,0,0
+NewestFileColor=0,208,0
+OldestFileColor=240,0,0
+Position=0,22
+PreProcessorCmd=
+RecentAFiles=
+RecentBFiles=
+RecentCFiles=
+RecentEncodings=
+RecentOutputFiles=
+RecursiveDirs=1
+ReplaceTabs=1
+RightToLeftLanguage=0
+RunHistoryAutoMergeOnMergeStart=0
+RunRegExpAutoMergeOnMergeStart=0
+SameEncoding=1
+Show Statusbar=1
+Show Toolbar=1
+ShowIdenticalFiles=0
+ShowInfoDialogs=1
+ShowLineNumbers=1
+ShowWhiteSpace=1
+ShowWhiteSpaceCharacters=1
+SkipDirStatus=0
+SyncMode=0
+TabSize=4
+TrustDate=0
+TrustDateFallbackToBinary=0
+TrustSize=0
+TryHard=1
+UnfoldSubdirs=0
+UseCvsIgnore=0
+WhiteSpace2FileMergeDefault=0
+WhiteSpace3FileMergeDefault=0
+WhiteSpaceEqual=1
+WindowStateMaximised=1
+WordWrap=0
diff --git a/.vimrc b/.vimrc
index 5ca6f5c0..e50bbea8 100755
--- a/.vimrc
+++ b/.vimrc
@@ -48,3 +48,6 @@ set laststatus=2
 set noshowmode
 set showtabline=1 "only show tabline when more than 1 tab
 
+" vimdiff
+set diffopt+=iwhite
+set diffexpr=""