Allow null chat token
Remove useless @NonNull
Actually set socket timeout as specified in configuration
Remove rediculous constructor
Issue #133: Remove generics requirements for addListener, removeListener, and listenerExists
Merge remote-tracking branch 'origin/upstream'