follow redirects to relative locations containing parent or current directories
Merge remote-tracking branch 'neilb/master'

Conflicts:
	lib/httparty/request.rb