New pull
Address feedback
Add spec for new #to_h method
Land #2396, aspx-exe shellcode generator

Looks good to me, specs are all happy (also added a #to_h spec)