Add support for multiple announce servers (fixes #677)

Somebody owes me a beer.
Yes, got lost in the merge.