Merge branch 'master' of https://github.com/dustinswan/dotfiles

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

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"

vim/bundle/vundle

@@ -1 +1 @@
-Subproject commit 2a494ff00fc10ed5725fbb99ec267ec2c9917817
+Subproject commit f31aa52552ceb40240e56e475e6df89cc756507e

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'