added bashrc
merged vimrc