Moar Borker fixes

Stop trying to start service before cloud init.
Merge pull request #124 from tbeckham/testing

Moar Borker fixes