use latest xmpp4r, remove history patch
Merge branch 'threading_restructure' into threading_and_sandstorm