diff --git a/.gitmodules b/.gitmodules
index 0e19dc7a..9af3214b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,24 @@
-[submodule ".vim/bundle/vim-fugitive"]
-	path = .vim/bundle/vim-fugitive
-	url = http://github.com/tpope/vim-fugitive
-[submodule ".vim/bundle/vim-markdown"]
-	path = .vim/bundle/vim-markdown
-	url = https://github.com/plasticboy/vim-markdown.git
 [submodule ".vim/bundle/vim-powerline"]
 	path = .vim/bundle/vim-powerline
 	url = https://github.com/Lokaltog/vim-powerline.git
-[submodule ".vim/bundle/vim-syntastic"]
-	path = .vim/bundle/vim-syntastic
-	url = https://github.com/scrooloose/syntastic
 [submodule "cygwin/mintty-colors-solarized"]
 	path = cygwin/mintty-colors-solarized
 	url = https://github.com/mavnn/mintty-colors-solarized.git
-[submodule ".vim/bundle/salt-vim"]
-	path = .vim/bundle/salt-vim
-	url = https://github.com/saltstack/salt-vim.git
-[submodule ".vim/bundle/vim-airline"]
-	path = .vim/bundle/vim-airline
-	url = https://github.com/bling/vim-airline
-[submodule ".vim/bundle/vim-gitgutter"]
-	path = .vim/bundle/vim-gitgutter
-	url = https://github.com/airblade/vim-gitgutter
 [submodule ".oh-my-zsh"]
 	path = .oh-my-zsh
 	url = git://github.com/robbyrussell/oh-my-zsh.git
-[submodule ".vim/bundle/nerdtree"]
-	path = .vim/bundle/nerdtree
-	url = https://github.com/scrooloose/nerdtree
-[submodule ".vim/bundle/vim-ctrlp"]
-	path = .vim/bundle/vim-ctrlp
-	url = https://github.com/kien/ctrlp.vim.git
 [submodule "tools/icdiff.git"]
 	path = tools/icdiff.git
 	url = https://github.com/jeffkaufman/icdiff.git
-[submodule ".vim/bundle/splice"]
-	path = .vim/bundle/splice
-	url = https://github.com/sjl/splice.vim.git
-[submodule ".vim/bundle/vim-dirdiff"]
-	path = .vim/bundle/vim-dirdiff
-	url = git://github.com/will133/vim-dirdiff
 [submodule "tools/subuser"]
 	path = tools/subuser
 	url = https://github.com/subuser-security/subuser
 [submodule ".oh-my-zsh-plugins/zsh-syntax-highlighting"]
 	path = .oh-my-zsh-plugins/zsh-syntax-highlighting
 	url = git://github.com/zsh-users/zsh-syntax-highlighting.git
-[submodule ".vim/bundle/rust.vim"]
-	path = .vim/bundle/rust.vim
-	url = https://github.com/rust-lang/rust.vim.git
 [submodule ".vim/bundle/YouCompleteMe"]
 	path = .vim/bundle/YouCompleteMe
 	url = https://github.com/Valloric/YouCompleteMe.git
-[submodule ".vim/bundle/ack.vim"]
-	path = .vim/bundle/ack.vim
-	url = https://github.com/mileszs/ack.vim.git
-[submodule ".vim/bundle/vim-cargo"]
-	path = .vim/bundle/vim-cargo
-	url = https://github.com/timonv/vim-cargo.git
-[submodule ".vim/bundle/vim-dispatch"]
-	path = .vim/bundle/vim-dispatch
-	url = https://github.com/tpope/vim-dispatch.git
 [submodule ".vim/bundle/Vundle.vim"]
 	path = .vim/bundle/Vundle.vim
 	url = https://github.com/VundleVim/Vundle.vim.git
diff --git a/.vim/bundle/ack.vim b/.vim/bundle/ack.vim
deleted file mode 160000
index 0a7d28bf..00000000
--- a/.vim/bundle/ack.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0a7d28bfb130696f73d122cac99d8903e066c896
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
deleted file mode 160000
index f8fd2ecc..00000000
--- a/.vim/bundle/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f8fd2ecce20f5005e6313ce57d6d2a209890c946
diff --git a/.vim/bundle/rust.vim b/.vim/bundle/rust.vim
deleted file mode 160000
index 115d321d..00000000
--- a/.vim/bundle/rust.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 115d321d383eb96d438466c56cc871fcc1bd0faa
diff --git a/.vim/bundle/salt-vim b/.vim/bundle/salt-vim
deleted file mode 160000
index bdfd0a55..00000000
--- a/.vim/bundle/salt-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bdfd0a558898df77aa8fc4c7b142062fdee3b2f7
diff --git a/.vim/bundle/splice b/.vim/bundle/splice
deleted file mode 160000
index 4d322d82..00000000
--- a/.vim/bundle/splice
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4d322d823563f6fd2d72c129b1e99f5a98060fa8
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
deleted file mode 160000
index 246c2175..00000000
--- a/.vim/bundle/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 246c217562dfd8541ee0d64600a628daa4195dd2
diff --git a/.vim/bundle/vim-cargo b/.vim/bundle/vim-cargo
deleted file mode 160000
index fbf907c3..00000000
--- a/.vim/bundle/vim-cargo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fbf907c353eaafdf4a270f66c1bb6aad767d874f
diff --git a/.vim/bundle/vim-ctrlp b/.vim/bundle/vim-ctrlp
deleted file mode 160000
index b5d3fe66..00000000
--- a/.vim/bundle/vim-ctrlp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f
diff --git a/.vim/bundle/vim-dirdiff b/.vim/bundle/vim-dirdiff
deleted file mode 160000
index 779185c3..00000000
--- a/.vim/bundle/vim-dirdiff
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 779185c33cccada094f59aa1345ffe19d2e581e4
diff --git a/.vim/bundle/vim-dispatch b/.vim/bundle/vim-dispatch
deleted file mode 160000
index 5f5c22c9..00000000
--- a/.vim/bundle/vim-dispatch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5f5c22c9ed48ee64fc5f02ac3acd543b97732fe8
diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
deleted file mode 160000
index 0374322b..00000000
--- a/.vim/bundle/vim-fugitive
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0374322ba5d85ae44dd9dc44ef31ca015a59097e
diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter
deleted file mode 160000
index 39f01190..00000000
--- a/.vim/bundle/vim-gitgutter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 39f011909620e0c7ae555efdace20c3963ac88af
diff --git a/.vim/bundle/vim-markdown b/.vim/bundle/vim-markdown
deleted file mode 160000
index 74c9c607..00000000
--- a/.vim/bundle/vim-markdown
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 74c9c60796ef10284ba26aaf38ffb39beae5f62c
diff --git a/.vim/bundle/vim-syntastic b/.vim/bundle/vim-syntastic
deleted file mode 160000
index 87f3e80b..00000000
--- a/.vim/bundle/vim-syntastic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 87f3e80b443870ce821f82dd1b3dba5bd66b51b2
diff --git a/.vimrc b/.vimrc
index 1c24ac65..446283a4 100755
--- a/.vimrc
+++ b/.vimrc
@@ -51,20 +51,31 @@ set expandtab
 
 filetype off 
 
-" set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 
-" let Vundle manage Vundle, required
 Plugin 'VundleVim/Vundle.vim'
 
 Plugin 'https://github.com/cyplo/vim-colors-solarized.git'
+Plugin 'mileszs/ack.vim'
+Plugin 'scrooloose/nerdtree.git'
+Plugin 'scrooloose/syntastic.git'
+Plugin 'wting/rust.vim'
+Plugin 'sjl/splice.vim.git'
+Plugin 'vim-airline/vim-airline'
+Plugin 'timonv/vim-cargo'
+Plugin 'kien/ctrlp.vim'
+Plugin 'will133/vim-dirdiff'
+Plugin 'tpope/vim-dispatch.git'
+Plugin 'tpope/vim-fugitive.git'
+Plugin 'airblade/vim-gitgutter.git'
+Plugin 'godlygeek/tabular'
+Plugin 'plasticboy/vim-markdown'
 
-call vundle#end()            " required
-filetype plugin indent on    " required
+call vundle#end()
+filetype plugin indent on
 
-
-" colours [need pathogen]
+" colours
 set t_Co=256
 syntax enable
 set background=dark