Update to support packer 0.5.1 and to simplify the packer template