Merge pull request #474 from zhaojunmeng/master

Add *~ to ignore vim temp file.