diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..c27cc5f8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+vim/bundle/*
+!vim/bundle/Vundle.vim
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..eedd1ebb
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vim/bundle/Vundle.vim"]
+	path = vim/bundle/Vundle.vim
+	url = https://github.com/VundleVim/Vundle.vim
diff --git a/bashrc b/bashrc
index 5f825aef..547560d5 100644
--- a/bashrc
+++ b/bashrc
@@ -126,6 +126,8 @@ if [ -x /usr/bin/mint-fortune ]; then
 fi
 
 alias ..='cd ..'
+alias 2..='cd ../..'
+alias 3..='cd ../../..'
 alias vi='vim'
 alias clc='clear'
 alias a='acpi'
diff --git a/setup.sh b/setup.sh
new file mode 100644
index 00000000..e0e6bed5
--- /dev/null
+++ b/setup.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/bash
+
+# move existing files
+rm ~/.vimrc_old
+rm ~/.bashrc_old
+rm -r ~/.vim_old
+mv ~/.vimrc ~/.vimrc_old
+mv ~/.bashrc ~/.bashrc_old
+mv ~/.vim ~/.vim_old
+ln -s ~/.dotfiles/vimrc ~/.vimrc
+ln -s ~/.dotfiles/vim ~/.vim
+ln -s ~/.dotfiles/bashrc ~/.bashrc
+
+git submodule init
+git submodule update
diff --git a/vim/bundle/Lucius2 b/vim/bundle/Lucius2
deleted file mode 160000
index d2f1baef..00000000
--- a/vim/bundle/Lucius2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d2f1baef189c2d0bac39f2948b26606a2b2ca5f5
diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim
index 9a38216a..b255382d 160000
--- a/vim/bundle/Vundle.vim
+++ b/vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d
+Subproject commit b255382d6242d7ea3877bf059d2934125e0c4d95
diff --git a/vim/bundle/YouCompleteMe b/vim/bundle/YouCompleteMe
deleted file mode 160000
index c25e449f..00000000
--- a/vim/bundle/YouCompleteMe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c25e449f4e72667aca3d18d8bfccd7b289b2e9a1
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
deleted file mode 160000
index 72c36567..00000000
--- a/vim/bundle/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 72c3656799289d4635520c28e17f737066ce19d6
diff --git a/vim/bundle/nerdtree-git-plugin b/vim/bundle/nerdtree-git-plugin
deleted file mode 160000
index 325a1298..00000000
--- a/vim/bundle/nerdtree-git-plugin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 325a1298b0c9d8a4c61388a2f9956a534a9068cd
diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline
deleted file mode 160000
index 98bc6abd..00000000
--- a/vim/bundle/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 98bc6abde3860600e599c7ad17fdfb80809c04af
diff --git a/vim/bundle/vim-airline-themes b/vim/bundle/vim-airline-themes
deleted file mode 160000
index 3bfe1d00..00000000
--- a/vim/bundle/vim-airline-themes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9
diff --git a/vim/bundle/vim-colorschemes b/vim/bundle/vim-colorschemes
deleted file mode 160000
index 2f532d05..00000000
--- a/vim/bundle/vim-colorschemes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2f532d0564534accf09cecfa9a1e3639865367ee
diff --git a/vimrc b/vimrc
index 4235ba5f..d86f535e 100644
--- a/vimrc
+++ b/vimrc
@@ -6,18 +6,15 @@ call vundle#begin()
 Plugin 'VundleVim/Vundle.vim'
 
 "My Plugins"
-"Plugin 'ervandew/supertab'
-Plugin 'Valloric/YouCompleteMe'
+Plugin 'ervandew/supertab'
+"Plugin 'Valloric/YouCompleteMe'
 Plugin 'flazz/vim-colorschemes'
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
 "Plugin 'vim-scripts/auto-pairs-gentle'
-"Plugin 'luochen1990/rainbow'
 "Plugin 'Yggdroot/indentLine'
 Plugin 'scrooloose/nerdtree'
 Plugin 'Xuyuanp/nerdtree-git-plugin'
-"Plugin 'rakr/vim-one'
-Plugin 'maksimr/Lucius2'
 
 call vundle#end()            " required
 filetype plugin indent on    " required