improve .gitignore and sort it (my OCD is back again!)