Updated the vim repo and fixed the swp file issue.