Update .gitignore
Merge branch 'thom'