Unit updates

Fixes https://github.com/coreos/init/pull/110 among other things
I guess I defaulted to "just make it so" but being less clobber-happy in the face of the unexpected is fine too. I'll drop -f