minor gitignore update
Merge https://github.com/martine/ninja
Pull from master
fix old merge conflict