Update vim files
Merge remote-tracking branch 'origin/mac' into mac