diff --git a/tmux/clocks.sh b/tmux/clocks.sh
index 047ae1b..1d7bbba 100755
--- a/tmux/clocks.sh
+++ b/tmux/clocks.sh
@@ -8,9 +8,9 @@ buffTime="$(TZ=America/New_York date +%R)"
 utcTime="$(date -u +%R)"
 bangTime="$(TZ=Asia/Kolkata date +%R)"
 
-caliForm="#[fg=red][ $caliTime ]"
-buffForm="#[fg=green][ $buffTime ]"
-utcForm="#[fg=blue][ $utcTime ]"
-bangForm="#[fg=magenta][ $bangTime ]"
+caliForm="#[fg=red]<][ $caliTime ] "
+buffForm="#[fg=green]<][ $buffTime ][> "
+utcForm="#[fg=blue][ $utcTime ][> "
+bangForm="#[fg=magenta][ $bangTime ][>>"
 
-echo $caliForm$buffForm$utcForm$bangForm
+echo $caliForm$buffForm$utcForm$bangForm" "
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 7735f03..29f8740 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -15,7 +15,10 @@ setw -g pane-base-index 1
 set -g renumber-windows on
 
 #change default delay to be a bit more responsive
-set -s escape-time 1
+set -sg escape-time 0
+
+#amount of time for which messages/indicators are displayed (in ms)
+set -g display-time 2000
 
 ######
 # Mouse
@@ -96,3 +99,6 @@ bind r source-file ~/.tmux.conf \; display "Config Reloaded!"
 
 # copy/paste improvements :: NOT WORKING PROPERLY NOW
 #bind C-c run "tmux save-buffer - | xclip -i -sel clipboard"
+
+# Capture a pane into file for uploading to Gist
+bind-key u capture-pane \; save-buffer /tmp/tmux-buffer
diff --git a/vim/README.md b/vim/README.md
index 6aa0131..2bea13c 100644
--- a/vim/README.md
+++ b/vim/README.md
@@ -8,7 +8,7 @@ My vim configuration is relatively straight forward.
 * Relative numbering, with mapping to quickly swap
 
 ###Bundles File
-The vimrc.bundles file stores the plugin information for Vundle. Currently, I
+The vimrc.bundles file stores the plugin information for Vim-Plug. Currently, I
 use the following plugins:
 * [Fugitive](https://github.com/tpope/vim-fugitive) for nice Git integration.
 * [Airline](https://github.com/bling/vim-airline) to look nice, but not garish.
@@ -18,8 +18,14 @@ use the following plugins:
 * [Templates](https://github.com/ap/vim-templates.git) for easy templates.
 * [vimwiki](https://github.com/vimwiki/vimwiki) for info, diary and notes.
 
+###Pending Plugins
+The following should be eventually installed and configured properly:
+* Syntastic
+* vim-startify
+* vim-dispatch
+
 ####To-Do
-* [ ]  (Optional) Customize Airline more.
+* [ ] Customize Airline more (Optional)
 * [ ] Consider adding [gist-vim](https://github.com/mattn/gist-vim) due to
   prevalence of Gist at work
 * [ ] Look into [ctrlp](https://github.com/kien/ctrlp.vim) for more awesome
diff --git a/vim/vimrc b/vim/vimrc
index 2aced75..70e54bb 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -5,39 +5,22 @@
 " Type :so % to refresh .vimrc after making changes
 
 "######
-"# Settings
+"# General Settings
 "##
 
-" https://stackoverflow.com/questions/5845557/in-a-vimrc-is-set-nocompatible-completely-useless
+" Be IMproved ( Why? https://goo.gl/2RiJoo )
 set nocompatible
 
+" Necessary for Syntax hilighting and cool stuff
+syntax on
+filetype plugin indent on
+
 " Auto-reload files changed outside Vim
 set autoread
 
-" Map Leader key
-let mapleader = ","
-
 " Shows you which commands you're typing
 set showcmd
 
-" Enables addons via Pathogen
-" Add-ons go in ~/.vim/bundle/
-" runtime bundle/vim-pathogen/autoload/pathogen.vim
-" execute pathogen#infect()
-
-" Load plugins with Vundle
-if filereadable(expand("~/.vimrc.bundles"))
-  source ~/.vimrc.bundles
-endif
-
-" Airline configuration
-set laststatus=2
-let g:airline_powerline_fonts = 1
-
-" Necessary for Syntax hilighting
-syntax on
-filetype plugin indent on
-
 " Enable line numbers, and make them relative
 set number
 set rnu
@@ -54,7 +37,7 @@ set softtabstop=5
 " Set width; word wrap; scroll mods
 set scrolloff=5
 set tw=80
-set colorcolumn=+1
+set colorcolumn
 set wrap
 
 " Enable auto-completion for vim commands
@@ -67,13 +50,29 @@ set wildmode:longest:full,full
 set incsearch
 set hlsearch
 
-" Set color scheme... duh...
+" Set default/backup colorscheme
 colorscheme desert
 
+"######
+"# Plugins
+"###
+
+" Old Way: Pathogen, add-ons go in ~/.vim/bundle/
+"    runtime bundle/vim-pathogen/autoload/pathogen.vim
+"    execute pathogen#infect()
+
+" New Way: Vim-Plug, add-ons configured in .vimrc.bundles
+     if filereadable(expand("~/.vimrc.bundles"))
+          source ~/.vimrc.bundles
+     endif
+
 "######
 "# Mappings
 "##
 
+" Map Leader key
+let mapleader = ","
+
 " Making moving up/down work on wrapped lines of text
 nnoremap <silent> j gj
 nnoremap <silent> k gk
@@ -90,14 +89,15 @@ nnoremap <silent> <leader>n :set rnu!<CR>
 nnoremap <silent> <leader>h :set nohlsearch!<CR>
 
 " Edit dotfiles with <leader>d
-"    v is for vim
-nnoremap <silent> <leader>dv :tabnew ~/.dotfiles/vim/vimrc<CR>
-"    b is for bash
-"nnoremap <silent> <leader>db :tabnew ~/.dotfiles/bash/bashrc<CR>
-"    t is for tmux
-nnoremap <silent> <leader>dt :tabnew ~/.dotfiles/tmux/tmux.conf<CR>
-"    d is for dotfiles install script
-nnoremap <silent> <leader>dd :tabnew ~/.dotfiles/install.conf.yaml<CR>
+"  v is for vim
+     nnoremap <silent> <leader>dv :tabnew ~/.dotfiles/vim/vimrc<CR>
+     nnoremap <silent> <leader>dp :tabnew ~/.dotfiles/vim/vimrc.bundles<CR>
+"  b is for bash
+"    nnoremap <silent> <leader>db :tabnew ~/.dotfiles/bash/bashrc<CR>
+"  t is for tmux
+     nnoremap <silent> <leader>dt :tabnew ~/.dotfiles/tmux/tmux.conf<CR>
+"  d is for dotfiles install script
+     nnoremap <silent> <leader>dd :tabnew ~/.dotfiles/install.conf.yaml<CR>
 
 " Remap ESC in insert mode
 inoremap jk <esc>
diff --git a/vim/vimrc.bundles b/vim/vimrc.bundles
index 1ead264..e197132 100644
--- a/vim/vimrc.bundles
+++ b/vim/vimrc.bundles
@@ -1,29 +1,37 @@
-set nocompatible              " be iMproved, required
-filetype off                  " required
+" ######
+" # Plugin File for Vim Using
+" # Vim-Plug: A minimalist Vim plugin manager
+" ###
 
-" set the runtime path to include Vundle and initialize
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
+" ###
+" Quick-Reference
+" ===
+" :PlugInstall - install plugins
+" :PlugUpdate - install/update plugins
+" :PlugUpgrade - upgrade vim-plug
+" ###
 
-" let Vundle manage Vundle, required
-Plugin 'VundleVim/Vundle.vim'
+" ######
+" # Fetch
+" ###
+
+call plug#begin('~/.vim/bundle')
 
 " Current list of plugins
-Plugin 'tpope/vim-fugitive'
-Plugin 'tpope/vim-vinegar'
-Plugin 'bling/vim-airline'
-Plugin 'justinmk/vim-sneak'
-Plugin 'ap/vim-templates'
-Plugin 'vimwiki/vimwiki'
+Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-vinegar'
+Plug 'bling/vim-airline'
+Plug 'justinmk/vim-sneak'
+Plug 'ap/vim-templates'
+Plug 'vimwiki/vimwiki'
+Plug 'mhinz/vim-startify'
 
-call vundle#end()
+call plug#end()
 
-" Brief help
-" " :PluginList       - lists configured plugins
-" " :PluginInstall    - installs plugins; append `!` to update or just
-" :PluginUpdate
-" " :PluginSearch foo - searches for foo; append `!` to refresh local cache
-" " :PluginClean      - confirms removal of unused plugins; append `!` to
-" auto-approve removal
-" "
-" " see :h vundle for more details or wiki for FAQ
+" ######
+" # Configs
+" ###
+
+" Airline configuration
+set laststatus=2
+let g:airline_powerline_fonts = 1