Looks like they're fixing some bugs in 1.2.5 including the villager overspawning issue:
"Fixed potential issue with village door detection (which could cause too many villagers)"
I guess when I update the server on Wednesday I'll turn villagers back on
