fix gitignore for *~
Merge branch 'master' into maps

Conflicts:
	.gitignore