Http client refactor

Refactoring of the Matrix HTTP clients (and fix things like the captcha client inheriting from the wrong base, plus some dead wood).