Merge branch 'master' of git://github.com/fritzy/SleekXMPP into develop

# By Joe Hildebrand (2) and Lance Stout (1)
# Via Lance Stout
* 'master' of git://github.com/fritzy/SleekXMPP:
  Relax timing issues in Iq timeout callback test.
  update JID_CACHE logic again.
  Allow IQ timeouts to be asynchronous, by passing a timeout_callback parameter to send().  An example modification of disco is included.  If this approach is approved, I'll go through and update the other plugins.

Conflicts:
	tests/test_stream_handlers.py

tests/test_stream_handlers.py

@@ -177,7 +177,7 @@ def handle_timeout(iq):
         """)
 
         # Give event queue time to process
-        time.sleep(0.1)
+        time.sleep(1)
 
         self.failUnless(events == ['timeout'],
                 "Iq timeout was not executed: %s" % events)