Merge pull request #474 from zhaojunmeng/master

Add *~ to ignore vim temp file.

Global/vim.gitignore

@@ -1,4 +1,5 @@
 .*.s[a-w][a-z]
 *.un~
 Session.vim
-.netrwhist
+.netrwhist
+*~