Changes applied to the packer windows repository

I should have forked this repository initially rather than modifying it
locally. I don't exactly have a good track of all the changes here, but
it'll do initially.