Update .gitignore

Remove duplicate entries, remove obsolete entries,
tidy up order
Remove trash