Update bashrc and vimrc
Merge branch 'master' of github.com:lad/dotfiles