Merge pull request spf13#299 from jamestomasino/easyWindows

Add option to skip window navigation mappings and keep digraph key

.vimrc

@@ -200,10 +200,16 @@
     endif
 
     " Easier moving in tabs and windows
-    map <C-J> <C-W>j<C-W>_
-    map <C-K> <C-W>k<C-W>_
-    map <C-L> <C-W>l<C-W>_
-    map <C-H> <C-W>h<C-W>_
+    " The lines conflict with the default digraph mapping of <C-K>
+    " If you prefer that functionality, add let g:spf13_no_easyWindows = 1
+    " in your .vimrc.bundles.local file
+
+    if !exists('g:spf13_no_easyWindows')
+        map <C-J> <C-W>j<C-W>_
+        map <C-K> <C-W>k<C-W>_
+        map <C-L> <C-W>l<C-W>_
+        map <C-H> <C-W>h<C-W>_
+    endif
 
     " Wrapped lines goes down/up to next row, rather than next line in file.
     nnoremap j gj