diff --git a/nvim/nvimrc.symlink b/nvim/nvimrc.symlink
index 926f1f0..8a43b6d 100644
--- a/nvim/nvimrc.symlink
+++ b/nvim/nvimrc.symlink
@@ -47,6 +47,7 @@ Plug 'jelera/vim-javascript-syntax', { 'for': 'javascript' }
 Plug 'mxw/vim-jsx', { 'for': 'jsx' }
 Plug 'elzr/vim-json', { 'for': 'json' }
 Plug 'Quramy/tsuquyomi', { 'for': 'typescript', 'do': 'npm install' }
+Plug 'Shougo/vimproc.vim', { 'do': 'make' }
 Plug 'leafgarland/typescript-vim', { 'for': 'typescript' }
 " Plug 'juvenn/mustache.vim', { 'for': 'mustache' }
 Plug 'mustache/vim-mustache-handlebars'
diff --git a/vim/vim.symlink/autoload/plug.vim b/vim/vim.symlink/autoload/plug.vim
index e21e8dc..edf9552 100644
--- a/vim/vim.symlink/autoload/plug.vim
+++ b/vim/vim.symlink/autoload/plug.vim
@@ -1182,6 +1182,17 @@ class Command(object):
       self.proc = subprocess.Popen(self.cmd, cwd=self.cmd_dir, stdout=tfile,
                                    stderr=subprocess.STDOUT, shell=True,
                                    preexec_fn=os.setsid)
+      thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,))
+      thrd.start()
+
+      thread_not_started = True
+      while thread_not_started:
+        try:
+          thrd.join(0.1)
+          thread_not_started = False
+        except RuntimeError:
+          pass
+
       while self.alive:
         if G_STOP.is_set():
           raise KeyboardInterrupt
@@ -1196,7 +1207,7 @@ class Command(object):
         if time_diff > self.timeout:
           raise CmdTimedOut(['Timeout!'])
 
-        time.sleep(0.33)
+        thrd.join(0.5)
 
       tfile.seek(0)
       result = [line.decode('utf-8', 'replace').rstrip() for line in tfile]
diff --git a/vim/vim.symlink/plugins.vim b/vim/vim.symlink/plugins.vim
index a25cc59..8c3c93d 100644
--- a/vim/vim.symlink/plugins.vim
+++ b/vim/vim.symlink/plugins.vim
@@ -10,7 +10,6 @@ call plug#begin('~/.vim/plugged')
 Plug 'chriskempson/base16-vim'
 
 
-" utilities
 Plug 'kien/ctrlp.vim'
 Plug 'scrooloose/nerdtree', { 'on': ['NERDTreeToggle', 'NERDTreeFind'] } | Plug 'Xuyuanp/nerdtree-git-plugin' | Plug 'ryanoasis/vim-devicons'
 Plug 'mileszs/ack.vim'
@@ -23,6 +22,7 @@ Plug 'tpope/vim-surround'
 Plug 'benmills/vimux'
 Plug 'bling/vim-airline'
 Plug 'scrooloose/syntastic'
+" Plug 'benekastah/neomake'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-repeat'
 Plug 'garbas/vim-snipmate'
@@ -52,9 +52,10 @@ Plug 'jelera/vim-javascript-syntax', { 'for': 'javascript' }
 Plug 'mxw/vim-jsx', { 'for': 'jsx' }
 Plug 'elzr/vim-json', { 'for': 'json' }
 Plug 'Quramy/tsuquyomi', { 'for': 'typescript', 'do': 'npm install' }
+Plug 'Shougo/vimproc.vim', { 'do': 'make' }
 Plug 'leafgarland/typescript-vim', { 'for': 'typescript' }
 " Plug 'juvenn/mustache.vim', { 'for': 'mustache' }
-Plug 'mustache/vim-mustache-handlebars', { 'for': ['mustache', 'handlebars', 'html.handlebars'] }
+Plug 'mustache/vim-mustache-handlebars'
 Plug 'digitaltoad/vim-jade', { 'for': 'jade' }
 Plug 'cakebaker/scss-syntax.vim', { 'for': 'scss' }
 Plug 'wavded/vim-stylus', { 'for': ['stylus', 'markdown'] }