gitignore cleanup and fixes