Do not override SRV port

Fixes #437
Accept error IQ packet as ping reply

Fixes #368
Merge branch 'connect1' of https://github.com/devrandom/Gibberbot into devrandom-connect1