Don't double nest options in options

I've noticed that any headers that get passed into the generated `client_from_x` style methods were not included the headers specified.  It seems that this is because Heroics is passing in `options[:options]` rather than just `options`.

This commit removes that doubling up.

(NB, I have three tests failing locally, but these are failing with and without this commit)