vim updates
merge master
zenbook updates