mods to bashrc, vimrc
Merge branch 'master' of https://github.com/toddbranch/dotfiles