Merge branch 'master' of https://github.com/Hervature/rubarb

Conflicts:
	lib/rubarb/api/client/rubarb_e_client_socket.rb