update vimrc
Merge branch 'master' of github.com:mgreenly/dotfiles
update bashrc