Added setter timeout property to the Client.getHttpClient method
Merge branch 'master' of https://github.com/dieselpoint/rhubarb.git

Conflicts:
	src/main/java/io/rhubarb/core/Client.java