Issue #12: cloud-init

Pulled in Amanda's changes and hopefully it col wrapped everything correctly.