Moral of story: Make sure you do a pull *before* you make changes to your .gitignore in case commits include files you're ignoring.