fix cloud-init for machineidentity
Merge branch 'master' of github.com:racker/virgo