Fix the addresses/port numbers we send in the hello message
Merge branch 'develop' into vote_recommended