Clean up gitignore
Merge branch 'd'