Sync to latest dot_vim master