diff --git a/install b/install
index e550d97..eb3f214 100755
--- a/install
+++ b/install
@@ -275,9 +275,10 @@ mkfolder ~/.vim/syntax
 lnfile vimrc ~/.vimrc
 
 # Install my plugins
-lnfile vim/plugin/long-lines.vim        ~/.vim/plugin/
-lnfile vim/plugin/match-brackets.vim    ~/.vim/plugin/
-lnfile vim/plugin/airline-settings.vim  ~/.vim/plugin/
+lnfile vim/plugin/long-lines.vim            ~/.vim/plugin/
+lnfile vim/plugin/match-brackets.vim        ~/.vim/plugin/
+lnfile vim/plugin/airline-settings.vim      ~/.vim/plugin/
+lnfile vim/plugin/bufferline-settings.vim   ~/.vim/plugin/
 
 # Install my ftdetect plugins
 lnfile vim/ftdetect/swig.vim            ~/.vim/ftdetect/
@@ -302,6 +303,7 @@ Bundle  vimwiki                             # Vimwiki
 Bundle  msanders/snipmate.vim               # snipMate
 Bundle  tomtom/tcomment_vim                 # tComment
 Bundle  bling/vim-airline                   # Airline is awesome!
+Bundle  bling/vim-bufferline                # Display buffers in Airline
 
 #######################################################################
 # Install tmux & screen config files
diff --git a/vim/plugin/bufferline-settings.vim b/vim/plugin/bufferline-settings.vim
new file mode 100644
index 0000000..3e2e66b
--- /dev/null
+++ b/vim/plugin/bufferline-settings.vim
@@ -0,0 +1,11 @@
+" File: bufferline-settings.vim
+" Author: Nirenjan Krishnan
+" Description: Settings for the bufferline plugin
+" Last Modified: March 17, 2014
+
+" Do not echo to the command bar (It's already showing up in airline)
+let g:bufferline_echo = 0
+
+" Allow scrolling, place the active buffer at the end
+let g:bufferline_rotate = 1
+let g:bufferline_fixed_index = -1
diff --git a/vimrc b/vimrc
index a902351..8c6c013 100644
--- a/vimrc
+++ b/vimrc
@@ -40,6 +40,9 @@ set hlsearch
 " Show status line
 set laststatus=2
 
+" Enable hidden buffers
+set hidden
+
 " Show tab line
 set showtabline=2