Update .gitignore
Tweak .gitignore
Merge branch 'master' into animations

Conflicts:
	.gitignore