clean up some minor problems
replace xpPrim with xpJid in ServiceDiscovery
Merge branch 'master' of github.com:pontarius/pontarius-xmpp