Unit ordering, cleanups, etc.

Depends on the following:

 - https://github.com/coreos/scripts/pull/214
 - https://github.com/coreos/init/pull/74
 - https://github.com/coreos/coreos-cloudinit/pull/62

Needs more testing but I think this is mostly there.