updated vimrc
merging
set default editor to vim