Modified .gitignore
Pull from upstream