modified .vimrc
modified .bashrc
merged