diff --git a/bundles b/bundles
new file mode 100644
index 0000000..424b184
--- /dev/null
+++ b/bundles
@@ -0,0 +1,24 @@
+# List of Vim bundles
+# Pathogen v2.2
+tpope/vim-pathogen      v2.2
+
+# A Git wrapper so awesome, it should be illegal
+tpope/vim-fugitive
+
+# tmux config file syntax
+zaiste/tmux.vim
+
+# Solarized
+altercation/vim-colors-solarized
+
+# Vimwiki
+vimwiki     2.1
+
+# snipMate
+msanders/snipmate.vim
+
+# tComment
+tomtom/tcomment_vim     2.08
+
+# Airline
+bling/vim-airline       v0.3
diff --git a/vimrc b/vimrc
index 6e57c5b..c31b0f5 100644
--- a/vimrc
+++ b/vimrc
@@ -43,18 +43,12 @@ set laststatus=2
 " Show tab line
 set showtabline=2
 
-" Set status to show all details
-set statusline=%F           " Full path to filename
-set statusline+=%m          " Modified flag
-set statusline+=%h          " Help buffer flag
-set statusline+=%w          " Preview window flag
-set statusline+=\ %y        " File type
-set statusline+=%=          " Switch to right align
-set statusline+=[%03.3b     " ASCII value for character under cursor
-set statusline+=/0x%02.2B]  " Same, but in hex
-set statusline+=\ [%v       " Virtual column number
-set statusline+=,%l/%L]     " Current line number, total lines
-set statusline+=\ [%p%%]    " Percentage through file
+" Statusline is handled by the airline plugin. Just set the ttm accordingly
+set ttm=50
+let g:airline_theme='solarized'
+let g:airline_left_sep=''
+let g:airline_right_sep=''
+"let g:airline_section_z='[%03.3b/0x%02.2B] %3.3p%% : %l/%L : %v '
 
 " Set the cursorline option
 " This (by default shows up as underlining)