cleanup
cleanup
mark 2.6 tests to disabled on travis
clean up dead code and honour the encoding config
adding docs
fixing tests
Added exception logging
Merge remote-tracking branch 'upstream/master'
Added handling of connection errors and reconnection.