I just got bitten by a file being caught by the .gitignore, which shouldn't have been, and am now pissed off with the .gitignore. I have basically declared bankruptcy on it and started again.