diff --git a/.gitignore b/.gitignore
index 598fa21..f906725 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 *.bak
 *.swp
-.vim/bundle/*/*
+.vim/bundle/*
 
diff --git a/.vim/bundle/FuzzyFinder b/.vim/bundle/FuzzyFinder
deleted file mode 160000
index b9f1659..0000000
--- a/.vim/bundle/FuzzyFinder
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b9f165970346df55862853dd83c8a4f2b2b70262
diff --git a/.vim/bundle/L9 b/.vim/bundle/L9
deleted file mode 160000
index c822b05..0000000
--- a/.vim/bundle/L9
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c822b05ee0886f9a9703227dc85a6d47612c4bf1
diff --git a/.vim/bundle/eregex.vim b/.vim/bundle/eregex.vim
deleted file mode 160000
index cf80475..0000000
--- a/.vim/bundle/eregex.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cf804755b16e7161a6e2013ed2df9ca775db94d9
diff --git a/.vim/bundle/gist-vim b/.vim/bundle/gist-vim
deleted file mode 160000
index aad7fb3..0000000
--- a/.vim/bundle/gist-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aad7fb31849c548ec21fcb018e2bf49629f4f290
diff --git a/.vim/bundle/git-vim b/.vim/bundle/git-vim
deleted file mode 160000
index 6e122b3..0000000
--- a/.vim/bundle/git-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6e122b30af7898a6edcff408f4ed1e5859194257
diff --git a/.vim/bundle/jellybeans.vim b/.vim/bundle/jellybeans.vim
deleted file mode 160000
index 2737231..0000000
--- a/.vim/bundle/jellybeans.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2737231a45b02e54c53c1912ba06d7e77502cb46
diff --git a/.vim/bundle/molokai b/.vim/bundle/molokai
deleted file mode 160000
index aa8a761..0000000
--- a/.vim/bundle/molokai
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aa8a76130ddac4e5b73d474531ff4d273b0815b4
diff --git a/.vim/bundle/neobundle.vim b/.vim/bundle/neobundle.vim
deleted file mode 160000
index 423c85f..0000000
--- a/.vim/bundle/neobundle.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 423c85fb3eafaa351bbb5233701a6f32ac03b60d
diff --git a/.vim/bundle/neocomplcache b/.vim/bundle/neocomplcache
deleted file mode 160000
index f272d8b..0000000
--- a/.vim/bundle/neocomplcache
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f272d8b335bf09fad3b78e98a3240e85756a2451
diff --git a/.vim/bundle/nginx.vim b/.vim/bundle/nginx.vim
deleted file mode 160000
index 152bbb2..0000000
--- a/.vim/bundle/nginx.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 152bbb2dc00c2df37049ccf75f68f294208c72cb
diff --git a/.vim/bundle/unite-outline b/.vim/bundle/unite-outline
deleted file mode 160000
index 962aaa6..0000000
--- a/.vim/bundle/unite-outline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 962aaa61d5585634c15c3a7071df7c6a12c5e3cd
diff --git a/.vim/bundle/unite-tag b/.vim/bundle/unite-tag
deleted file mode 160000
index 31f44b5..0000000
--- a/.vim/bundle/unite-tag
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 31f44b5bb5392f385fc5b51f56ab155745476b04
diff --git a/.vim/bundle/unite.vim b/.vim/bundle/unite.vim
deleted file mode 160000
index 16b25fe..0000000
--- a/.vim/bundle/unite.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 16b25fef38303e6ba66dc6121e0c6c595c94116c
diff --git a/.vim/bundle/vim-colors-solarized b/.vim/bundle/vim-colors-solarized
deleted file mode 160000
index 528a59f..0000000
--- a/.vim/bundle/vim-colors-solarized
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
deleted file mode 160000
index b0c74e2..0000000
--- a/.vim/bundle/vim-fugitive
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0c74e2289a1c1617a6446184f6de77b88750133
diff --git a/.vim/bundle/vim-markdown b/.vim/bundle/vim-markdown
deleted file mode 160000
index 7b747d0..0000000
--- a/.vim/bundle/vim-markdown
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7b747d0aa4f2ff2239983c05bb4f18ea6e760770
diff --git a/.vim/bundle/vim-powerline b/.vim/bundle/vim-powerline
deleted file mode 160000
index 7f53b5c..0000000
--- a/.vim/bundle/vim-powerline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7f53b5c3919bde9a4259d0c725d453ef2337a4ed
diff --git a/.vim/bundle/vim-surround b/.vim/bundle/vim-surround
deleted file mode 160000
index 1a73f60..0000000
--- a/.vim/bundle/vim-surround
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1a73f607f8f5477d6942df2eb6e7245c4864f4d3
diff --git a/.vim/bundle/vim-twilight b/.vim/bundle/vim-twilight
deleted file mode 160000
index 82e8a87..0000000
--- a/.vim/bundle/vim-twilight
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 82e8a87d02d7f8b01bbc0f1d5135fe07d870870c
diff --git a/.vim/bundle/vimfiler b/.vim/bundle/vimfiler
deleted file mode 160000
index e7b6e2e..0000000
--- a/.vim/bundle/vimfiler
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e7b6e2e21876d09c59bf39b0b4abd736e16f224b
diff --git a/.vim/bundle/vimproc b/.vim/bundle/vimproc
deleted file mode 160000
index 8b1febd..0000000
--- a/.vim/bundle/vimproc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8b1febd48805667fd6a5a87ef7c4ba67c2bb518e
diff --git a/.vim/bundle/vimshell b/.vim/bundle/vimshell
deleted file mode 160000
index c396416..0000000
--- a/.vim/bundle/vimshell
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c3964165420d657f27ebc04c68719a6209e64368
diff --git a/.vim/bundle/zencoding-vim b/.vim/bundle/zencoding-vim
deleted file mode 160000
index b731410..0000000
--- a/.vim/bundle/zencoding-vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b7314109461ab7ab9c386e2f33726fb1188e4ad8
diff --git a/.vimrc b/.vimrc
index 4601252..7de56b4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -66,7 +66,7 @@ let g:solarized_termtrans=1
 let g:solarized_degrade=0
 let g:solarized_bold=1
 let g:solarized_underline=1
-let g:solarized_italic=1
+let g:solarized_italic=0
 "let g:solarized_contrast="high"
 "let g:solarized_visibility="low"
 let g:molokai_original = 1
@@ -144,7 +144,7 @@ set pastetoggle=<C-e>
 "---------------------------------------------------------------------------
 " Tabs
 "---------------------------------------------------------------------------
-set showtabline=2
+"set showtabline=2
 nnoremap <Space>t t
 nnoremap <Space>T T
 nnoremap t <Nop>