my vimdiff skills are bad, fixing gitignore.