Update main .gitignore and remove from subdirectories