Pull forked repo back in [#159]

There is a lot of work that was done to the fork before @rest-client became official.

rest-client#159 should not be closed until all outstanding issues there have been moved or at least transcribed to here.