Update .gitignore

Merge with master