A couple of bug fixes:
* Fix generator to use the new hash header syntax.
* Fix header key conversion to account for “hyphen-to-underscore”

Signed-off-by: Josep M. Blanquer <blanquer@rightscale.com>