cleaning up after git's mess once again

why does it do this
it's not even just me, it did this to Sam too
argh