Merge branch 'feature/docker-image' of github.com:andytson/packer into andytson-feature/docker-image

Conflicts:
	config.go