Apparently something went wrong last time i tried to commit these things, and the version control system had failed us... or we failed it.
I fixed the code so that it worked again, and made some minor changes.