Merge pull request #81 from markpeek/markpeek-image

Image changes to support packer.io