Added support for sending tokens to the server when connecting along with username and password

Signed-off-by: Martin Evans <martindevans@gmail.com>