Bringing everything up to date.

This adds something already in the repo (because I thought I was supposed to pull request to sync the DB and it wants to remerge that stuff >_<) and the anti spam changes.

I still think I'm doing this Git thing wrong.