Update to build with current packer master.
Merge pull request #3 from scmcoord/build-against-packer-master

Update to build with current packer master.