'Merge' gitignore file from wayward branch