Fix git ignore file, was messed up in a merge.