.gitignore again again

RAWR!
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
I don't know what's going on anymore...