diff --git a/.gitignore b/.gitignore
index a0e76af..fcd2c90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 .netrwhist
+autoload/plug.vim
+plugged/
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 65eb403..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,63 +0,0 @@
-[submodule "bundle/fugitive"]
-	path = bundle/fugitive
-	url = git://github.com/tpope/vim-fugitive.git
-[submodule "bundle/vim-erlang"]
-	path = bundle/vim-erlang
-	url = git://github.com/jimenezrick/vimerl.git
-[submodule "bundle/surround"]
-	path = bundle/surround
-	url = git://github.com/tpope/vim-surround.git
-[submodule "bundle/snipmate"]
-	path = bundle/snipmate
-	url = git://github.com/msanders/snipmate.vim.git
-[submodule "bundle/ctrlp.vim"]
-	path = bundle/ctrlp.vim
-	url = https://github.com/kien/ctrlp.vim.git
-[submodule "bundle/vimerl"]
-	path = bundle/vimerl
-	url = git://github.com/jimenezrick/vimerl.git
-[submodule "bundle/hybrid.vim"]
-	path = bundle/hybrid.vim
-	url = git://github.com/w0ng/vim-hybrid.git
-[submodule "bundle/syntastic.vim"]
-	path = bundle/syntastic.vim
-	url = git://github.com/scrooloose/syntastic.git
-[submodule "bundle/scala.vim"]
-	path = bundle/scala.vim
-	url = git://github.com/jergason/scala.vim.git
-[submodule "bundle/tagbar.vim"]
-	path = bundle/tagbar.vim
-	url = git://github.com/majutsushi/tagbar.git
-[submodule "bundle/nginx-syntax.vim"]
-	path = bundle/nginx-syntax.vim
-	url = git://github.com/evanmiller/nginx-vim-syntax.git
-[submodule "bundle/vim-airline"]
-	path = bundle/vim-airline
-	url = git://github.com/bling/vim-airline.git
-[submodule "bundle/bling"]
-	path = bundle/bling
-	url = https://github.com/ivyl/vim-bling.git
-[submodule "bundle/emmet.vim"]
-	path = bundle/emmet.vim
-	url = https://github.com/mattn/emmet-vim.git
-[submodule "bundle/lion.vim"]
-	path = bundle/lion.vim
-	url = https://github.com/tommcdo/vim-lion.git
-[submodule "bundle/quickfixsigns.vim"]
-	path = bundle/quickfixsigns.vim
-	url = https://github.com/tomtom/quickfixsigns_vim.git
-[submodule "bundle/gitv.vim"]
-	path = bundle/gitv.vim
-	url = https://github.com/gregsexton/gitv.git
-[submodule "bundle/gocode.vim"]
-	path = bundle/gocode.vim
-	url = https://github.com/Blackrush/vim-gocode.git
-[submodule "bundle/json.vim"]
-	path = bundle/json.vim
-	url = https://github.com/leshill/vim-json.git
-[submodule "bundle/rust.vim"]
-	path = bundle/rust.vim
-	url = https://github.com/wting/rust.vim.git
-[submodule "bundle/coffee.vim"]
-	path = bundle/coffee.vim
-	url = https://github.com/kchmck/vim-coffee-script.git
diff --git a/autoload/pathogen.vim b/autoload/pathogen.vim
deleted file mode 100644
index a7edd06..0000000
--- a/autoload/pathogen.vim
+++ /dev/null
@@ -1,233 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.0
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc
-" prior to `filetype plugin indent on` is the only other setup necessary.
-"
-" The API is documented inline below.  For maximum ease of reading,
-" :set foldmethod=marker
-
-if exists("g:loaded_pathogen") || &cp
-  finish
-endif
-let g:loaded_pathogen = 1
-
-" Point of entry for basic default usage.  Give a directory name to invoke
-" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path
-" to invoke pathogen#runtime_prepend_subdirectories().  Afterwards,
-" pathogen#cycle_filetype() is invoked.
-function! pathogen#infect(...) abort " {{{1
-  let source_path = a:0 ? a:1 : 'bundle'
-  if source_path =~# '[\\/]'
-    call pathogen#runtime_prepend_subdirectories(source_path)
-  else
-    call pathogen#runtime_append_all_bundles(source_path)
-  endif
-  call pathogen#cycle_filetype()
-endfunction " }}}1
-
-" Split a path into a list.
-function! pathogen#split(path) abort " {{{1
-  if type(a:path) == type([]) | return a:path | endif
-  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
-  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
-endfunction " }}}1
-
-" Convert a list to a path.
-function! pathogen#join(...) abort " {{{1
-  if type(a:1) == type(1) && a:1
-    let i = 1
-    let space = ' '
-  else
-    let i = 0
-    let space = ''
-  endif
-  let path = ""
-  while i < a:0
-    if type(a:000[i]) == type([])
-      let list = a:000[i]
-      let j = 0
-      while j < len(list)
-        let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
-        let path .= ',' . escaped
-        let j += 1
-      endwhile
-    else
-      let path .= "," . a:000[i]
-    endif
-    let i += 1
-  endwhile
-  return substitute(path,'^,','','')
-endfunction " }}}1
-
-" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
-function! pathogen#legacyjoin(...) abort " {{{1
-  return call('pathogen#join',[1] + a:000)
-endfunction " }}}1
-
-" Remove duplicates from a list.
-function! pathogen#uniq(list) abort " {{{1
-  let i = 0
-  let seen = {}
-  while i < len(a:list)
-    if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
-      call remove(a:list,i)
-    elseif a:list[i] ==# ''
-      let i += 1
-      let empty = 1
-    else
-      let seen[a:list[i]] = 1
-      let i += 1
-    endif
-  endwhile
-  return a:list
-endfunction " }}}1
-
-" \ on Windows unless shellslash is set, / everywhere else.
-function! pathogen#separator() abort " {{{1
-  return !exists("+shellslash") || &shellslash ? '/' : '\'
-endfunction " }}}1
-
-" Convenience wrapper around glob() which returns a list.
-function! pathogen#glob(pattern) abort " {{{1
-  let files = split(glob(a:pattern),"\n")
-  return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")')
-endfunction "}}}1
-
-" Like pathogen#glob(), only limit the results to directories.
-function! pathogen#glob_directories(pattern) abort " {{{1
-  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
-endfunction "}}}1
-
-" Turn filetype detection off and back on again if it was already enabled.
-function! pathogen#cycle_filetype() " {{{1
-  if exists('g:did_load_filetypes')
-    filetype off
-    filetype on
-  endif
-endfunction " }}}1
-
-" Checks if a bundle is 'disabled'. A bundle is considered 'disabled' if
-" its 'basename()' is included in g:pathogen_disabled[]' or ends in a tilde.
-function! pathogen#is_disabled(path) " {{{1
-  if a:path =~# '\~$'
-    return 1
-  elseif !exists("g:pathogen_disabled")
-    return 0
-  endif
-  let sep = pathogen#separator()
-  return index(g:pathogen_disabled, strpart(a:path, strridx(a:path, sep)+1)) != -1
-endfunction "}}}1
-
-" Prepend all subdirectories of path to the rtp, and append all 'after'
-" directories in those subdirectories.
-function! pathogen#runtime_prepend_subdirectories(path) " {{{1
-  let sep    = pathogen#separator()
-  let before = filter(pathogen#glob_directories(a:path.sep."*"), '!pathogen#is_disabled(v:val)')
-  let after  = filter(pathogen#glob_directories(a:path.sep."*".sep."after"), '!pathogen#is_disabled(v:val[0:-7])')
-  let rtp = pathogen#split(&rtp)
-  let path = expand(a:path)
-  call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
-  let &rtp = pathogen#join(pathogen#uniq(before + rtp + after))
-  return &rtp
-endfunction " }}}1
-
-" For each directory in rtp, check for a subdirectory named dir.  If it
-" exists, add all subdirectories of that subdirectory to the rtp, immediately
-" after the original directory.  If no argument is given, 'bundle' is used.
-" Repeated calls with the same arguments are ignored.
-function! pathogen#runtime_append_all_bundles(...) " {{{1
-  let sep = pathogen#separator()
-  let name = a:0 ? a:1 : 'bundle'
-  if "\n".s:done_bundles =~# "\\M\n".name."\n"
-    return ""
-  endif
-  let s:done_bundles .= name . "\n"
-  let list = []
-  for dir in pathogen#split(&rtp)
-    if dir =~# '\<after$'
-      let list +=  filter(pathogen#glob_directories(substitute(dir,'after$',name,'').sep.'*[^~]'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
-    else
-      let list +=  [dir] + filter(pathogen#glob_directories(dir.sep.name.sep.'*[^~]'), '!pathogen#is_disabled(v:val)')
-    endif
-  endfor
-  let &rtp = pathogen#join(pathogen#uniq(list))
-  return 1
-endfunction
-
-let s:done_bundles = ''
-" }}}1
-
-" Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() " {{{1
-  let sep = pathogen#separator()
-  for dir in pathogen#split(&rtp)
-    if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(glob(dir.sep.'doc'.sep.'*')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
-      helptags `=dir.'/doc'`
-    endif
-  endfor
-endfunction " }}}1
-
-command! -bar Helptags :call pathogen#helptags()
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) "{{{1
-  let rtp = pathogen#join(1,pathogen#split(&rtp))
-  return fnamemodify(findfile(a:file,rtp,a:count),':p')
-endfunction " }}}1
-
-function! s:find(count,cmd,file,lcd) " {{{1
-  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
-  let file = pathogen#runtime_findfile(a:file,a:count)
-  if file ==# ''
-    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
-  elseif a:lcd
-    let path = file[0:-strlen(a:file)-2]
-    execute 'lcd `=path`'
-    return a:cmd.' '.fnameescape(a:file)
-  else
-    return a:cmd.' '.fnameescape(file)
-  endif
-endfunction " }}}1
-
-function! s:Findcomplete(A,L,P) " {{{1
-  let sep = pathogen#separator()
-  let cheats = {
-        \'a': 'autoload',
-        \'d': 'doc',
-        \'f': 'ftplugin',
-        \'i': 'indent',
-        \'p': 'plugin',
-        \'s': 'syntax'}
-  if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
-    let request = cheats[a:A[0]].a:A[1:-1]
-  else
-    let request = a:A
-  endif
-  let pattern = substitute(request,'\'.sep,'*'.sep,'g').'*'
-  let found = {}
-  for path in pathogen#split(&runtimepath)
-    let matches = split(glob(path.sep.pattern),"\n")
-    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
-    call map(matches,'v:val[strlen(path)+1:-1]')
-    for match in matches
-      let found[match] = 1
-    endfor
-  endfor
-  return sort(keys(found))
-endfunction " }}}1
-
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>,0)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>,0)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,1)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split',<q-args>,<bang>1)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
-
-" vim:set ft=vim ts=8 sw=2 sts=2:
diff --git a/bundle/bling b/bundle/bling
deleted file mode 160000
index 2aa1034..0000000
--- a/bundle/bling
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2aa1034081528442aed439e364c661abcd407de8
diff --git a/bundle/coffee.vim b/bundle/coffee.vim
deleted file mode 160000
index 18c6852..0000000
--- a/bundle/coffee.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 18c68524ab8a043a566bbe227ea8f81ab922d092
diff --git a/bundle/ctrlp.vim b/bundle/ctrlp.vim
deleted file mode 160000
index b5d3fe6..0000000
--- a/bundle/ctrlp.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f
diff --git a/bundle/emmet.vim b/bundle/emmet.vim
deleted file mode 160000
index fb11bd8..0000000
--- a/bundle/emmet.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fb11bd8b28fe30a4e95f8daacab34ccc2e6377e3
diff --git a/bundle/fugitive b/bundle/fugitive
deleted file mode 160000
index 8f0b8ed..0000000
--- a/bundle/fugitive
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8f0b8edfbd246c0026b7a2388e1d883d579ac7f6
diff --git a/bundle/gitv.vim b/bundle/gitv.vim
deleted file mode 160000
index 05792bd..0000000
--- a/bundle/gitv.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 05792bd103d2b4cb939108b5c25b79f0cba76881
diff --git a/bundle/gocode.vim b/bundle/gocode.vim
deleted file mode 160000
index 76f1ece..0000000
--- a/bundle/gocode.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 76f1ece5b6950f64f56f3c5d70a3c33e4f1e25af
diff --git a/bundle/hybrid.vim b/bundle/hybrid.vim
deleted file mode 160000
index 1539ae7..0000000
--- a/bundle/hybrid.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1539ae714dbaa1ab01c67fae44bd80a38cf51364
diff --git a/bundle/json.vim b/bundle/json.vim
deleted file mode 160000
index 3029554..0000000
--- a/bundle/json.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3029554ee1619f478fc5222bf4c6c08909b1be9c
diff --git a/bundle/lion.vim b/bundle/lion.vim
deleted file mode 160000
index 7420c77..0000000
--- a/bundle/lion.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7420c7739366d307641c3cc6ef7240cb84f0d1ac
diff --git a/bundle/nginx-syntax.vim b/bundle/nginx-syntax.vim
deleted file mode 160000
index 4ea8c14..0000000
--- a/bundle/nginx-syntax.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4ea8c1453c7aa9393e94fe33594fbd4c60307a7b
diff --git a/bundle/quickfixsigns.vim b/bundle/quickfixsigns.vim
deleted file mode 160000
index b9dc037..0000000
--- a/bundle/quickfixsigns.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b9dc037cfede96f99cc0697b94960d9cfe99bc54
diff --git a/bundle/rust.vim b/bundle/rust.vim
deleted file mode 160000
index f08c1ea..0000000
--- a/bundle/rust.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f08c1eafe936cd1c899fadcc052116494098941b
diff --git a/bundle/scala.vim b/bundle/scala.vim
deleted file mode 160000
index eb0bd6a..0000000
--- a/bundle/scala.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit eb0bd6a546f73e3b869b4ffc996e97a1136257d5
diff --git a/bundle/snipmate b/bundle/snipmate
deleted file mode 160000
index f5a75d0..0000000
--- a/bundle/snipmate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b
diff --git a/bundle/surround b/bundle/surround
deleted file mode 160000
index 6f0984a..0000000
--- a/bundle/surround
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6f0984a5ca1430047fe760fc680c6cf98ae94b01
diff --git a/bundle/syntastic.vim b/bundle/syntastic.vim
deleted file mode 160000
index e5dfcc3..0000000
--- a/bundle/syntastic.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e5dfcc3488e407c8e28b308cb6e631336e77d060
diff --git a/bundle/tagbar.vim b/bundle/tagbar.vim
deleted file mode 160000
index a93fb86..0000000
--- a/bundle/tagbar.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a93fb868d805f55888c0ae6342ba744f539d1810
diff --git a/bundle/vim-airline b/bundle/vim-airline
deleted file mode 160000
index 942c6ae..0000000
--- a/bundle/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 942c6ae382390421edad259edb09a441ae76540b
diff --git a/bundle/vim-erlang b/bundle/vim-erlang
deleted file mode 160000
index 9bd2432..0000000
--- a/bundle/vim-erlang
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9bd24327eb55146190275a78c36402835a53bae6
diff --git a/bundle/vimerl b/bundle/vimerl
deleted file mode 160000
index e36e0e8..0000000
--- a/bundle/vimerl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e36e0e8d694a0b64e982697ff9a4d3caf1e2b12e
diff --git a/setup.sh b/setup.sh
index 1dd622f..ce03c48 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,4 +2,3 @@
 
 ln -s ~/.vim/vimrc ~/.vimrc
 cd ~/.vim
-git submodule update --recursive --init
diff --git a/vimrc b/vimrc
index 565efb1..8d5b24d 100644
--- a/vimrc
+++ b/vimrc
@@ -1,8 +1,38 @@
 set shell=/bin/bash
 scriptencoding utf-8
 set encoding=utf-8
+set shortmess=I "turn off splash screen
+
+let have_plug=filereadable(expand('~/.vim/autoload/plug.vim'))
+if(!have_plug && executable('curl'))
+    echo "Installing Plug"
+
+    !curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+endif
+
+if(have_plug)
+    call plug#begin('~/.vim/plugged')
+    Plug 'ivyl/vim-bling'                 "blink search results
+    Plug 'kien/ctrlp.vim'                 "Fuzzy search
+    Plug 'mattn/emmet-vim'                "ZenCoding
+    Plug 'tpope/vim-fugitive'             "Work with git repos
+    Plug 'gregsexton/gitv'                "GitK for Fugitive
+    Plug 'w0ng/vim-hybrid'                "Hybrid colorscheme
+    Plug 'leshill/vim-json'               "JSON support
+    Plug 'tommcdo/vim-lion'               "Align stuff
+    Plug 'evanmiller/nginx-vim-syntax'    "Nginx Syntax
+    Plug 'msanders/snipmate.vim'          "Snippets
+    Plug 'tpope/vim-surround'             "Surround with quotes
+    Plug 'scrooloose/syntastic'           "Syntax checker
+    Plug 'majutsushi/tagbar'              "Ctags integration
+    Plug 'bling/vim-airline'              "Status bar
+    call plug#end()
+
+    if empty(glob("~/.vim/plugged"))
+        PlugInstall
+    endif
+endif
 
-call pathogen#infect()
 syntax on               "enable syntax hightlighting
 
 set autoindent          "enable autoindent
@@ -17,7 +47,7 @@ set visualbell
 set wildmenu            "show autocomplete menu
 set wildmode=full
 
-colorscheme hybrid
+silent! colorscheme hybrid
 
 "Set <leader> before any key remapping
 let mapleader = '\'
@@ -49,7 +79,7 @@ if has("autocmd")
     autocmd filterwritepre * if &diff | map <leader>} :diffget \\3<cr>| endif
 
 
-    augroup javascript 
+    augroup javascript
         "Custom mappings
         au!
         autocmd BufRead *.js nmap <leader>f* :call JsFunctionLookup()<cr>zz