Use net.JoinHostPort
Fix crash in test
Merge pull request #258 from lavalamp/misc_cleanup

Use net.JoinHostPort