Move vim mappings away from `<Leader>f` for CtrlPFunky

Find conflicts is now `<Leader>c` and the fold level mappings are moved
logically to `zf<number>` (`z` is for folding commands in general).

vim/settings/folding.vim

@@ -35,16 +35,16 @@ if has('folding')
   nnoremap <silent> <Leader><Space>     @=(foldlevel('.')?'za':"\<Space>")<CR>
 
   " Code folding options (spf13-vim)
-  nmap <Leader>f0 :set foldlevel=0<CR>
-  nmap <Leader>f1 :set foldlevel=1<CR>
-  nmap <Leader>f2 :set foldlevel=2<CR>
-  nmap <Leader>f3 :set foldlevel=3<CR>
-  nmap <Leader>f4 :set foldlevel=4<CR>
-  nmap <Leader>f5 :set foldlevel=5<CR>
-  nmap <Leader>f6 :set foldlevel=6<CR>
-  nmap <Leader>f7 :set foldlevel=7<CR>
-  nmap <Leader>f8 :set foldlevel=8<CR>
-  nmap <Leader>f9 :set foldlevel=9<CR>
+  nmap zf0 :set foldlevel=0<CR>
+  nmap zf1 :set foldlevel=1<CR>
+  nmap zf2 :set foldlevel=2<CR>
+  nmap zf3 :set foldlevel=3<CR>
+  nmap zf4 :set foldlevel=4<CR>
+  nmap zf5 :set foldlevel=5<CR>
+  nmap zf6 :set foldlevel=6<CR>
+  nmap zf7 :set foldlevel=7<CR>
+  nmap zf8 :set foldlevel=8<CR>
+  nmap zf9 :set foldlevel=9<CR>
   " }}}
 
   " Fold Highlighting {{{

vim/settings/version_control.vim

@@ -11,7 +11,7 @@ if has("autocmd")
 endif
 
 " Search for conflict markers
-nnoremap <Leader>fc /\v^[<\|=>]{7}( .*\|$)<CR>
+nnoremap <Leader>c /\v^[<\|=>]{7}( .*\|$)<CR>
 
 " Git commands with Fugitive
 nnoremap <silent> <Leader>gc :Gcommit -v<CR>