Adds vim undodir setting + minor cleanup