changes to bashrc and vimrc
merged bashrc