Various vim and bash tweaks
Merge branch 'master' of github.com:silas/dotfiles