Merging .gitignore changes.