Fix server regex to match all servers again.

This should fix #9 now, but it is a bit inelegant.