Bump xml-conduit due to fix mentioned in #39
Merge branch 'master' into upstream
export reconnectNow from Concurrent.hs
twiddle with reconnect times
remove  waitingTimes function
split up reconnect function
make disco code compile again