diff --git a/.vim/vimrc b/.vim/vimrc
index 3007bdc..7895655 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -74,33 +74,38 @@ filetype off
 set rtp+=~/.vim/bundle/vundle
 call vundle#rc()
 
+" Plugins
 Bundle 'gmarik/vundle'
-Bundle 'git://github.com/samsonw/vim-task.git'
-Bundle 'L9'
-Bundle 'FuzzyFinder'
-Bundle 'vimwiki'
 Bundle 'git://github.com/sjl/gundo.vim.git'
 Bundle 'git://github.com/scrooloose/nerdcommenter.git'
 Bundle 'git://github.com/scrooloose/nerdtree.git'
+Bundle 'git://github.com/msanders/snipmate.vim.git'
+Bundle 'git://github.com/godlygeek/tabular.git'
+Bundle 'git://github.com/tpope/vim-surround.git'
+Bundle 'git://github.com/mattn/gist-vim.git'
+Bundle 'https://github.com/tpope/vim-fugitive.git'
+Bundle 'python.vim'
+Bundle 'https://github.com/kien/ctrlp.vim.git'
+Bundle 'scratch.vim'
+
+" Syntax
+Bundle 'https://github.com/groenewege/vim-less.git'
+Bundle 'go'
+
+" Themes
 Bundle 'git://github.com/jnurmine/Zenburn.git'
-" Bundle 'git://github.com/Raimondi/delimitMate.git'
-" Bundle 'git://github.com/kana/vim-smartinput.git'
 Bundle 'git://github.com/ciaranm/inkpot.git'
 Bundle 'git://github.com/nanotech/jellybeans.vim.git'
 Bundle 'git://github.com/guns/jellyx.vim.git'
-Bundle 'git://github.com/msanders/snipmate.vim.git'
 Bundle 'git://github.com/strange/strange.vim.git'
-Bundle 'git://github.com/godlygeek/tabular.git'
 Bundle 'git://github.com/veloce/vim-aldmeris.git'
 Bundle 'git://github.com/altercation/vim-colors-solarized.git'
 Bundle 'git://github.com/Lokaltog/vim-distinguished.git'
 Bundle 'git://github.com/nelstrom/vim-mac-classic-theme.git'
 Bundle 'git://github.com/atonse/vydark.git'
 Bundle 'git://github.com/vim-scripts/vylight.git'
-Bundle 'git://github.com/tpope/vim-surround.git'
 Bundle 'git://github.com/tpope/vim-vividchalk.git'
 Bundle 'git://github.com/ciaranm/inkpot.git'
-Bundle 'git://github.com/mattn/gist-vim.git'
 Bundle 'git://github.com/jpo/vim-railscasts-theme.git'
 Bundle 'git://github.com/oguzbilgic/sexy-railscasts-theme.git'
 Bundle 'git://github.com/mrkn/mrkn256.vim.git'
@@ -119,23 +124,18 @@ Bundle 'Skittles-Dark'
 Bundle 'tortex'
 Bundle 'mayansmoke'
 Bundle 'https://github.com/sjl/badwolf.git'
-Bundle 'https://github.com/kien/ctrlp.vim.git'
 Bundle 'https://github.com/w0ng/vim-hybrid.git'
 Bundle 'https://github.com/blackgate/tropikos-vim-theme.git'
 Bundle 'https://github.com/zaki/zazen.git'
 Bundle 'https://github.com/jonathanfilip/vim-lucius.git'
 Bundle 'https://github.com/chriskempson/vim-tomorrow-theme.git'
 Bundle 'https://github.com/tangphillip/SunburstVIM.git'
-Bundle 'https://github.com/groenewege/vim-less.git'
-Bundle 'https://github.com/tpope/vim-fugitive.git'
-Bundle 'python.vim'
 Bundle 'https://github.com/nelstrom/vim-blackboard.git'
 Bundle 'https://github.com/tomasr/molokai.git'
 Bundle 'https://github.com/zeis/vim-kolor.git'
 Bundle 'https://github.com/morhetz/gruvbox.git'
 Bundle 'https://github.com/trapd00r/neverland-vim-theme.git'
 Bundle 'https://github.com/chriskempson/base16-vim.git'
-Bundle 'scratch.vim'
 "Bundle 'https://github.com/changyuheng/holokai.git'
 Bundle 'https://github.com/ryanc/holokai.git'
 Bundle 'https://github.com/noahfrederick/Hemisu.git'