.gitignore reworked

(cherry picked from commit 37231aa6679b0fe5aba7c8b0bc023fa63a698fa2)