Unit updates

Fixes https://github.com/coreos/init/pull/110 among other things