Update make.conf
Move cloud-init to a more generic location