Merge branch 'master' into feature/ripgrep

vim/settings/search.vim

@@ -10,11 +10,11 @@ function! GetVisual()
   return selection
 endfunction
 
-"grep the current word using K (mnemonic Kurrent)
-nnoremap <silent> K :Rg <cword><CR>
+"grep the current word using ,k (mnemonic Kurrent)
+nnoremap <silent> ,k :Rg <cword><CR>
 
 "grep visual selection
-vnoremap K :<C-U>execute "Rg " . GetVisual()<CR>
+vnoremap ,k :<C-U>execute "Rg " . GetVisual()<CR>
 
 "grep current word up to the next exclamation point using ,K
 nnoremap ,K viwf!:<C-U>execute "Rg " . GetVisual()<CR>
@@ -27,4 +27,4 @@ nnoremap <silent> ,gd :Rg 'def <cword>'<CR>
 nnoremap ,gg :Rg ""<left>
 
 "Grep for usages of the current file
-nnoremap ,gcf :exec "Rg " . expand("%:t:r")<CR>
+nnoremap ,gcf :exec "Rg " . expand("%:t:r")<CR>

vim/vundles/languages.vundle

@@ -5,3 +5,5 @@ Bundle 'jtratner/vim-flavored-markdown.git'
 Bundle 'scrooloose/syntastic.git'
 Bundle 'nelstrom/vim-markdown-preview'
 Bundle 'skwp/vim-html-escape'
+Bundle 'mxw/vim-jsx'
+Bundle 'jparise/vim-graphql'

vim/vundles/project.vundle

@@ -2,5 +2,6 @@ Bundle "jistr/vim-nerdtree-tabs.git"
 Bundle "scrooloose/nerdtree.git"
 Bundle "ctrlpvim/ctrlp.vim"
 Bundle 'JazzCore/ctrlp-cmatcher'
+Bundle 'junegunn/fzf'
 Bundle "xolox/vim-misc"
 Bundle "xolox/vim-session"