Update .gitignore

Remove duplicate entries, remove obsolete entries,
tidy up order

Conflicts:
	.gitignore
Remove trash

Conflicts:
	GUI/Thumbs.db