bashrc should allow local by default. Also setting tabstop to match softtabstop in vimrc
Merge branch 'master' of github.com:ccoley/dotfiles