Fixing up the .gitignore file from merge.