ok. Just re-add my .gitignore things and I'll merge.