Fix and clean top .gitignore