Merge .gitignore from master