update vim setup
merge