From 88d3f39ef7b31b2cb8b15e4f5f070e07c9f9269b Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Thu, 16 Jan 2014 04:22:42 +0000
Subject: [PATCH 1/2] Adding calenadr.vim

---
 vimrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vimrc b/vimrc
index 1694976..5fa1f5f 100644
--- a/vimrc
+++ b/vimrc
@@ -58,6 +58,7 @@ Bundle 'bling/vim-airline'
 Bundle 'matze/vim-move'
 Bundle 'bruno-/vim-vertical-move'
 Bundle 'tpope/vim-vinegar'
+Bundle 'itchyny/calendar.vim'
 
 let $GIT_SSL_NO_VERIFY = 'true'
 

From 73d4724a45b6a81fdbccd5349598ee556195c25e Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Thu, 16 Jan 2014 17:07:48 -0600
Subject: [PATCH 2/2] Adding keyremap4macbook and asepsis to casks. Adding ta
 alias for tmux attach

---
 bootstrap-mac.sh  | 2 ++
 config.fish       | 1 +
 vim/bundle/vundle | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bootstrap-mac.sh b/bootstrap-mac.sh
index 4589421..f569e2a 100644
--- a/bootstrap-mac.sh
+++ b/bootstrap-mac.sh
@@ -50,6 +50,8 @@ brew cask install sketchup
 #brew cask install vagrant
 #brew cask install bittorrent-sync 
 #brew cask install truecrypt
+brew cask install asepsis
+brew cask install keyremap4macbook
 brew cleanup
 
 # Ruby TODO -- set up chruby, ruby-install some stuff
diff --git a/config.fish b/config.fish
index 6406b1d..8da9f94 100644
--- a/config.fish
+++ b/config.fish
@@ -1,6 +1,7 @@
 alias vi vim
 alias l "ls -la"
 alias tmux "tmux -2"
+alias ta "tmux attach"
 alias dustinswan "mosh dustinswan@dustinswan.org"
 set -x EDITOR "vim"
 set -x TERM "screen-256color"
diff --git a/vim/bundle/vundle b/vim/bundle/vundle
index 2a494ff..f31aa52 160000
--- a/vim/bundle/vundle
+++ b/vim/bundle/vundle
@@ -1 +1 @@
-Subproject commit 2a494ff00fc10ed5725fbb99ec267ec2c9917817
+Subproject commit f31aa52552ceb40240e56e475e6df89cc756507e