Merge pull request #276 from YorkZ/york

Add *~* pattern to .gitignore