New vimrc
Merging
Merge
vimrc update; added .tmux.conf