update VIM config file
merge with master