Vim updates
Merge remote