Merged Chris' xmpp code with new latest gamelogic (minus Reena's db updates)

This still needs work.  Chris can fix it.  Once it works again, then I
can add Reena's updates again.