Sync with latest dot_vim