Feature/more agsxmpp

don't accept this before pulling the current agsxmpp master