Properly merging URLs and removing dot segments based on RFC 3986 section 5.4. Closes #288 and #289.
Updating changelog
Making the default CURLOPT_CONNECTTIMEOUT more forgiving and closer to the default value of 300s
Fixing ReadLimitEntityBody::__toString() when the wrapped body is empty
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Guzzle/Http/Url.php
Moved composer name to avoid conflict.