retab
vimrc updates
Merge branch 'master' of github.com:djbender/dotfiles