Merge pull request #39 from snoyberg/master

Support for containers 0.4
add tlsConnect function
Merge branch 'master' into upstream
Bump xml-conduit due to fix mentioned in #39
improve reconnect

rename reconnect to reconnectNow
  * reconnect immediately
  * function returns failure mode on error

add reconnect function
  * retries when reconnect failes
  * waits exponentially increasing amount of seconds between attemps
  * returns last encountered error when all attempts fail
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
let reconnect return a Bool that indicates whether the reconnect was successful
export reconnect'
Hide Remove Subscription constructor
Remove Mahdi from list of authors since no code from him remains
clean up some minor problems
replace xpPrim with xpJid in ServiceDiscovery
Merge branch 'master' of github.com:pontarius/pontarius-xmpp
Remove the `StanzaID' type and the `IdGenerator' newtype
README.md: Various minor updates